From: Greg Kroah-Hartman Date: Mon, 6 Nov 2017 07:49:35 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v3.18.80~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80021b8e3984b029e016b821d0ba3e832d499f44;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: perf-tools-fix-build-failure-on-perl-script-context.patch --- diff --git a/queue-4.4/drm-amdgpu-return-enoent-from-uvd-6.0-early-init-for-harvesting.patch b/queue-4.4/drm-amdgpu-return-enoent-from-uvd-6.0-early-init-for-harvesting.patch deleted file mode 100644 index ef34768c3af..00000000000 --- a/queue-4.4/drm-amdgpu-return-enoent-from-uvd-6.0-early-init-for-harvesting.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cb4b02d7cac56a69d8137d8d843507cca9182aed Mon Sep 17 00:00:00 2001 -From: Leo Liu -Date: Tue, 31 Oct 2017 21:03:39 -0400 -Subject: drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting - -From: Leo Liu - -commit cb4b02d7cac56a69d8137d8d843507cca9182aed upstream. - -Fixes init failures on polaris cards with harvested UVD. - -Signed-off-by: Leo Liu -Reviewed-by: Alex Deucher -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -@@ -83,6 +83,10 @@ static int uvd_v6_0_early_init(void *han - { - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -+ if (!(adev->flags & AMD_IS_APU) && -+ (RREG32_SMC(ixCC_HARVEST_FUSES) & CC_HARVEST_FUSES__UVD_DISABLE_MASK)) -+ return -ENOENT; -+ - uvd_v6_0_set_ring_funcs(adev); - uvd_v6_0_set_irq_funcs(adev); - diff --git a/queue-4.4/perf-tools-fix-build-failure-on-perl-script-context.patch b/queue-4.4/perf-tools-fix-build-failure-on-perl-script-context.patch new file mode 100644 index 00000000000..da90c4a1bff --- /dev/null +++ b/queue-4.4/perf-tools-fix-build-failure-on-perl-script-context.patch @@ -0,0 +1,61 @@ +From b581c01fff646b5075d65359c8667de9c667da9e Mon Sep 17 00:00:00 2001 +From: Namhyung Kim +Date: Tue, 2 Aug 2016 11:43:17 +0900 +Subject: perf tools: Fix build failure on perl script context + +From: Namhyung Kim + +commit b581c01fff646b5075d65359c8667de9c667da9e upstream. + +On my Archlinux machine, perf faild to build like below: + + CC scripts/perl/Perf-Trace-Util/Context.o + In file included from /usr/lib/perl5/core/perl/CORE/perl.h:3905:0, + from Context.xs:23: + /usr/lib/perl5/core/perl/CORE/inline.h: In function : + /usr/lib/perl5/core/perl/CORE/cop.h:612:13: warning: declaration of 'av' + shadows a previous local [-Werror-shadow] + AV *av =3D GvAV(PL_defgv); + ^ + /usr/lib/perl5/core/perl/CORE/inline.h:526:5: note: in expansion of + macro 'CX_POP_SAVEARRAY' + CX_POP_SAVEARRAY(cx); + ^~~~~~~~~~~~~~~~ + In file included from /usr/lib/perl5/core/perl/CORE/perl.h:5853:0, + from Context.xs:23: + /usr/lib/perl5/core/perl/CORE/inline.h:518:9: note: + shadowed declaration is here + AV *av; + ^~ + +What I did to fix is adding '-Wno-shadow' as the error message said it's +the cause of the failure. Since it's from the perl (not perf) code +base, we don't have the control so I just wanted to ignore the warning +when compiling perl scripting code. + +Committer note: + +This also fixes the build on Fedora Rawhide. + +Signed-off-by: Namhyung Kim +Tested-by: Arnaldo Carvalho de Melo +Cc: Jiri Olsa +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20160802024317.31725-1-namhyung@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: Tuomas Tynkkynen +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/scripts/perl/Perf-Trace-Util/Build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/tools/perf/scripts/perl/Perf-Trace-Util/Build ++++ b/tools/perf/scripts/perl/Perf-Trace-Util/Build +@@ -1,3 +1,5 @@ + libperf-y += Context.o + +-CFLAGS_Context.o += $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-undef -Wno-switch-default ++CFLAGS_Context.o += $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes ++CFLAGS_Context.o += -Wno-unused-parameter -Wno-nested-externs -Wno-undef ++CFLAGS_Context.o += -Wno-switch-default -Wno-shadow diff --git a/queue-4.4/series b/queue-4.4/series index 28bc02e5530..6c7a35ed6d4 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -7,5 +7,5 @@ asoc-adau17x1-workaround-for-noise-bug-in-adc.patch arm64-ensure-__dump_instr-checks-addr_limit.patch arm-dts-mvebu-pl310-cache-disable-double-linefill.patch arm-8715-1-add-a-private-asm-unaligned.h.patch -drm-amdgpu-return-enoent-from-uvd-6.0-early-init-for-harvesting.patch ocfs2-fstrim-fix-start-offset-of-first-cluster-group-during-fstrim.patch +perf-tools-fix-build-failure-on-perl-script-context.patch