+++ /dev/null
-From 9564a8cf422d7b58f6e857e3546d346fa970191e Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-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 <linux@rasmusvillemoes.dk>
-
-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 <rdunlap@infradead.org>
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 := \#
+++ /dev/null
-From cec07f53c398f22576df77052c4777dc13f14962 Mon Sep 17 00:00:00 2001
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-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 <acme@redhat.com>
-
-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 <adrian.hunter@intel.com>
-Cc: David Ahern <dsahern@gmail.com>
-Cc: Jiri Olsa <jolsa@kernel.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Wang Nan <wangnan0@huawei.com>
-Link: http://lkml.kernel.org/n/tip-kpj6m3mbjw82kg6krk2z529e@git.kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 @@
--
+++ /dev/null
-From 3df8d9208569ef0b2313e516566222d745f3b94b Mon Sep 17 00:00:00 2001
-From: Andy Lutomirski <luto@kernel.org>
-Date: Thu, 15 Dec 2016 10:14:42 -0800
-Subject: x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
-
-From: Andy Lutomirski <luto@kernel.org>
-
-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 <luto@kernel.org>
-Acked-by: Borislav Petkov <bp@alien8.de>
-Cc: Brian Gerst <brgerst@gmail.com>
-Link: http://lkml.kernel.org/r/6ea30c0e9daec21e488b54761881a6dfcf3e04d0.1481825597.git.luto@kernel.org
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Cc: Brad Spengler <spender@grsecurity.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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;
- }
-
-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
projects / thirdparty / kernel / stable-queue.git / commitdiff
