From: Greg Kroah-Hartman Date: Wed, 18 Jul 2018 14:51:05 +0000 (+0200) Subject: move a bunch of things to the next 4.4 release to get one out now. X-Git-Tag: v4.4.142~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=877877a3ceb991f1d783e7acb1e8b5c07f0a0ec3;p=thirdparty%2Fkernel%2Fstable-queue.git move a bunch of things to the next 4.4 release to get one out now. --- diff --git a/queue-4.4/bcm63xx_enet-correct-clock-usage.patch b/pending/4.4/bcm63xx_enet-correct-clock-usage.patch similarity index 100% rename from queue-4.4/bcm63xx_enet-correct-clock-usage.patch rename to pending/4.4/bcm63xx_enet-correct-clock-usage.patch diff --git a/queue-4.4/bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch b/pending/4.4/bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch similarity index 100% rename from queue-4.4/bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch rename to pending/4.4/bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch diff --git a/queue-4.4/compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch b/pending/4.4/compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch similarity index 100% rename from queue-4.4/compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch rename to pending/4.4/compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch diff --git a/queue-4.4/compiler-clang-properly-override-inline-for-clang.patch b/pending/4.4/compiler-clang-properly-override-inline-for-clang.patch similarity index 100% rename from queue-4.4/compiler-clang-properly-override-inline-for-clang.patch rename to pending/4.4/compiler-clang-properly-override-inline-for-clang.patch diff --git a/queue-4.4/compiler-clang-suppress-warning-for-unused-static-inline-functions.patch b/pending/4.4/compiler-clang-suppress-warning-for-unused-static-inline-functions.patch similarity index 100% rename from queue-4.4/compiler-clang-suppress-warning-for-unused-static-inline-functions.patch rename to pending/4.4/compiler-clang-suppress-warning-for-unused-static-inline-functions.patch diff --git a/queue-4.4/compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch b/pending/4.4/compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch similarity index 100% rename from queue-4.4/compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch rename to pending/4.4/compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch diff --git a/queue-4.4/crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch b/pending/4.4/crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch similarity index 100% rename from queue-4.4/crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch rename to pending/4.4/crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch diff --git a/queue-4.4/crypto-crypto4xx-remove-bad-list_del.patch b/pending/4.4/crypto-crypto4xx-remove-bad-list_del.patch similarity index 100% rename from queue-4.4/crypto-crypto4xx-remove-bad-list_del.patch rename to pending/4.4/crypto-crypto4xx-remove-bad-list_del.patch diff --git a/pending/4.4/kbuild-fix-escaping-in-.cmd-files-for-future-make.patch b/pending/4.4/kbuild-fix-escaping-in-.cmd-files-for-future-make.patch new file mode 100644 index 00000000000..8d772054e2a --- /dev/null +++ b/pending/4.4/kbuild-fix-escaping-in-.cmd-files-for-future-make.patch @@ -0,0 +1,114 @@ +From 9564a8cf422d7b58f6e857e3546d346fa970191e Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Sun, 8 Apr 2018 23:35:28 +0200 +Subject: Kbuild: fix # escaping in .cmd files for future Make +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rasmus Villemoes + +commit 9564a8cf422d7b58f6e857e3546d346fa970191e upstream. + +I tried building using a freshly built Make (4.2.1-69-g8a731d1), but +already the objtool build broke with + +orc_dump.c: In function ‘orc_dump’: +orc_dump.c:106:2: error: ‘elf_getshnum’ is deprecated [-Werror=deprecated-declarations] + if (elf_getshdrnum(elf, &nr_sections)) { + +Turns out that with that new Make, the backslash was not removed, so cpp +didn't see a #include directive, grep found nothing, and +-DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS. + +Now, that new Make behaviour is documented in their NEWS file: + + * WARNING: Backward-incompatibility! + Number signs (#) appearing inside a macro reference or function invocation + no longer introduce comments and should not be escaped with backslashes: + thus a call such as: + foo := $(shell echo '#') + is legal. Previously the number sign needed to be escaped, for example: + foo := $(shell echo '\#') + Now this latter will resolve to "\#". If you want to write makefiles + portable to both versions, assign the number sign to a variable: + C := \# + foo := $(shell echo '$C') + This was claimed to be fixed in 3.81, but wasn't, for some reason. + To detect this change search for 'nocomment' in the .FEATURES variable. + +This also fixes up the two make-cmd instances to replace # with $(pound) +rather than with \#. There might very well be other places that need +similar fixup in preparation for whatever future Make release contains +the above change, but at least this builds an x86_64 defconfig with the +new make. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847 +Cc: Randy Dunlap +Signed-off-by: Rasmus Villemoes +Signed-off-by: Masahiro Yamada +Cc: Konstantin Khlebnikov +Signed-off-by: Greg Kroah-Hartman + +--- + scripts/Kbuild.include | 5 +++-- + tools/build/Build.include | 5 +++-- + tools/scripts/Makefile.include | 2 ++ + 3 files changed, 8 insertions(+), 4 deletions(-) + +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -7,6 +7,7 @@ quote := " + squote := ' + empty := + space := $(empty) $(empty) ++pound := \# + + ### + # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o +@@ -236,11 +237,11 @@ endif + + # Replace >$< with >$$< to preserve $ when reloading the .cmd file + # (needed for make) +-# Replace >#< with >\#< to avoid starting a comment in the .cmd file ++# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file + # (needed for make) + # Replace >'< with >'\''< to be able to enclose the whole string in '...' + # (needed for the shell) +-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1))))) ++make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1))))) + + # Find any prerequisites that is newer than target or that does not exist. + # PHONY targets skipped in both cases. +--- a/tools/build/Build.include ++++ b/tools/build/Build.include +@@ -12,6 +12,7 @@ + # Convenient variables + comma := , + squote := ' ++pound := \# + + ### + # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o +@@ -43,11 +44,11 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),\ + ### + # Replace >$< with >$$< to preserve $ when reloading the .cmd file + # (needed for make) +-# Replace >#< with >\#< to avoid starting a comment in the .cmd file ++# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file + # (needed for make) + # Replace >'< with >'\''< to be able to enclose the whole string in '...' + # (needed for the shell) +-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1))))) ++make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1))))) + + ### + # Find any prerequisites that is newer than target or that does not exist. +--- a/tools/scripts/Makefile.include ++++ b/tools/scripts/Makefile.include +@@ -92,3 +92,5 @@ ifneq ($(silent),1) + QUIET_INSTALL = @printf ' INSTALL %s\n' $1; + endif + endif ++ ++pound := \# diff --git a/queue-4.4/ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch b/pending/4.4/ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch similarity index 100% rename from queue-4.4/ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch rename to pending/4.4/ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch diff --git a/pending/4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch b/pending/4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch new file mode 100644 index 00000000000..a2bd1760616 --- /dev/null +++ b/pending/4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch @@ -0,0 +1,109 @@ +From cec07f53c398f22576df77052c4777dc13f14962 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Thu, 7 Jul 2016 18:28:43 -0300 +Subject: perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/ + +From: Arnaldo Carvalho de Melo + +commit cec07f53c398f22576df77052c4777dc13f14962 upstream. + +And remove the empty tools/arch/x86/include/asm/unistd_{32,64}.h files +introduced by eae7a755ee81 ("perf tools, x86: Build perf on older +user-space as well"). + +This way we get closer to mirroring the kernel for cases where __NR_ +can't be found for some include path/_GNU_SOURCE/whatever scenario. + +Cc: Adrian Hunter +Cc: David Ahern +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Wang Nan +Link: http://lkml.kernel.org/n/tip-kpj6m3mbjw82kg6krk2z529e@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Cc: Konstantin Khlebnikov +Signed-off-by: Greg Kroah-Hartman + +--- + tools/arch/x86/include/asm/unistd_32.h | 9 +++++++++ + tools/arch/x86/include/asm/unistd_64.h | 9 +++++++++ + tools/perf/config/Makefile | 1 + + tools/perf/perf-sys.h | 18 ------------------ + tools/perf/util/include/asm/unistd_32.h | 1 - + tools/perf/util/include/asm/unistd_64.h | 1 - + 6 files changed, 19 insertions(+), 20 deletions(-) + +--- /dev/null ++++ b/tools/arch/x86/include/asm/unistd_32.h +@@ -0,0 +1,9 @@ ++#ifndef __NR_perf_event_open ++# define __NR_perf_event_open 336 ++#endif ++#ifndef __NR_futex ++# define __NR_futex 240 ++#endif ++#ifndef __NR_gettid ++# define __NR_gettid 224 ++#endif +--- /dev/null ++++ b/tools/arch/x86/include/asm/unistd_64.h +@@ -0,0 +1,9 @@ ++#ifndef __NR_perf_event_open ++# define __NR_perf_event_open 298 ++#endif ++#ifndef __NR_futex ++# define __NR_futex 202 ++#endif ++#ifndef __NR_gettid ++# define __NR_gettid 186 ++#endif +--- a/tools/perf/config/Makefile ++++ b/tools/perf/config/Makefile +@@ -200,6 +200,7 @@ CFLAGS += -I$(src-perf)/arch/$(ARCH)/inc + CFLAGS += -I$(srctree)/tools/include/ + CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi + CFLAGS += -I$(srctree)/arch/$(ARCH)/include ++CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include + CFLAGS += -I$(srctree)/include/uapi + CFLAGS += -I$(srctree)/include + +--- a/tools/perf/perf-sys.h ++++ b/tools/perf/perf-sys.h +@@ -11,29 +11,11 @@ + #if defined(__i386__) + #define cpu_relax() asm volatile("rep; nop" ::: "memory"); + #define CPUINFO_PROC {"model name"} +-#ifndef __NR_perf_event_open +-# define __NR_perf_event_open 336 +-#endif +-#ifndef __NR_futex +-# define __NR_futex 240 +-#endif +-#ifndef __NR_gettid +-# define __NR_gettid 224 +-#endif + #endif + + #if defined(__x86_64__) + #define cpu_relax() asm volatile("rep; nop" ::: "memory"); + #define CPUINFO_PROC {"model name"} +-#ifndef __NR_perf_event_open +-# define __NR_perf_event_open 298 +-#endif +-#ifndef __NR_futex +-# define __NR_futex 202 +-#endif +-#ifndef __NR_gettid +-# define __NR_gettid 186 +-#endif + #endif + + #ifdef __powerpc__ +--- a/tools/perf/util/include/asm/unistd_32.h ++++ /dev/null +@@ -1 +0,0 @@ +- +--- a/tools/perf/util/include/asm/unistd_64.h ++++ /dev/null +@@ -1 +0,0 @@ +- diff --git a/queue-4.4/revert-sit-reload-iphdr-in-ipip6_rcv.patch b/pending/4.4/revert-sit-reload-iphdr-in-ipip6_rcv.patch similarity index 100% rename from queue-4.4/revert-sit-reload-iphdr-in-ipip6_rcv.patch rename to pending/4.4/revert-sit-reload-iphdr-in-ipip6_rcv.patch diff --git a/pending/4.4/series b/pending/4.4/series new file mode 100644 index 00000000000..dd1311fa161 --- /dev/null +++ b/pending/4.4/series @@ -0,0 +1,14 @@ +kbuild-fix-escaping-in-.cmd-files-for-future-make.patch +x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch +perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch +compiler-clang-suppress-warning-for-unused-static-inline-functions.patch +compiler-clang-properly-override-inline-for-clang.patch +compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch +compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch +x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch +revert-sit-reload-iphdr-in-ipip6_rcv.patch +ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch +bcm63xx_enet-correct-clock-usage.patch +bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch +crypto-crypto4xx-remove-bad-list_del.patch +crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch diff --git a/queue-4.4/x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch b/pending/4.4/x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch similarity index 100% rename from queue-4.4/x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch rename to pending/4.4/x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch diff --git a/pending/4.4/x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch b/pending/4.4/x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch new file mode 100644 index 00000000000..c4a521e673c --- /dev/null +++ b/pending/4.4/x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch @@ -0,0 +1,45 @@ +From 3df8d9208569ef0b2313e516566222d745f3b94b Mon Sep 17 00:00:00 2001 +From: Andy Lutomirski +Date: Thu, 15 Dec 2016 10:14:42 -0800 +Subject: x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6 + +From: Andy Lutomirski + +commit 3df8d9208569ef0b2313e516566222d745f3b94b upstream. + +A typo (or mis-merge?) resulted in leaf 6 only being probed if +cpuid_level >= 7. + +Fixes: 2ccd71f1b278 ("x86/cpufeature: Move some of the scattered feature bits to x86_capability") +Signed-off-by: Andy Lutomirski +Acked-by: Borislav Petkov +Cc: Brian Gerst +Link: http://lkml.kernel.org/r/6ea30c0e9daec21e488b54761881a6dfcf3e04d0.1481825597.git.luto@kernel.org +Signed-off-by: Thomas Gleixner +Cc: Brad Spengler +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/cpu/common.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -686,13 +686,14 @@ void get_cpu_cap(struct cpuinfo_x86 *c) + c->x86_capability[CPUID_1_EDX] = edx; + } + ++ /* Thermal and Power Management Leaf: level 0x00000006 (eax) */ ++ if (c->cpuid_level >= 0x00000006) ++ c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006); ++ + /* Additional Intel-defined flags: level 0x00000007 */ + if (c->cpuid_level >= 0x00000007) { + cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); +- + c->x86_capability[CPUID_7_0_EBX] = ebx; +- +- c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006); + c->x86_capability[CPUID_7_ECX] = ecx; + } + diff --git a/queue-4.4/series b/queue-4.4/series index dd1311fa161..3040ba4d1c0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,14 +1,3 @@ kbuild-fix-escaping-in-.cmd-files-for-future-make.patch x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch -compiler-clang-suppress-warning-for-unused-static-inline-functions.patch -compiler-clang-properly-override-inline-for-clang.patch -compiler-clang-always-inline-when-config_optimize_inlining-is-disabled.patch -compiler-gcc.h-add-__attribute__-gnu_inline-to-all-inline-declarations.patch -x86-asm-add-_asm_arg-constants-for-argument-registers-to-asm-asm.h.patch -revert-sit-reload-iphdr-in-ipip6_rcv.patch -ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch -bcm63xx_enet-correct-clock-usage.patch -bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch -crypto-crypto4xx-remove-bad-list_del.patch -crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_build_sdr-leak.patch