From: Ingo Molnar Date: Mon, 6 Nov 2017 08:49:28 +0000 (+0100) Subject: Merge branch 'x86/mm' into x86/asm, to pick up pending changes X-Git-Tag: v4.19~2241^2~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75ec4eb3dc84ee78533bd59bbb71992187bd86fd;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'x86/mm' into x86/asm, to pick up pending changes Concentrate x86 MM and asm related changes into a single super-topic, in preparation for larger changes. Signed-off-by: Ingo Molnar --- 75ec4eb3dc84ee78533bd59bbb71992187bd86fd diff --cc arch/x86/kernel/Makefile index 5335d05,a97a6b6..d449c5a --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@@ -24,8 -24,10 +24,9 @@@ endi KASAN_SANITIZE_head$(BITS).o := n KASAN_SANITIZE_dumpstack.o := n KASAN_SANITIZE_dumpstack_$(BITS).o := n - KASAN_SANITIZE_stacktrace.o := n + KASAN_SANITIZE_stacktrace.o := n + KASAN_SANITIZE_paravirt.o := n -OBJECT_FILES_NON_STANDARD_head_$(BITS).o := y OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o := y OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o := y OBJECT_FILES_NON_STANDARD_test_nx.o := y