summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-23 13:31:17 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-23 13:31:17 +0200
commitbae9525531c1f73bfd9b34d2e065d95a352ba9da (patch)
tree0b56f3babd60b13501bfbacc98e034df067bad8c /arch/x86/kernel/Makefile
parentf95b23a112f1a31ea042483540cd907b58d23a5f (diff)
parent6a93bb7e4a7d6670677d5b0eb980936eb9cc5d2e (diff)
downloadlinux-bae9525531c1f73bfd9b34d2e065d95a352ba9da.tar.bz2
Merge branch 'core/objtool' into x86/asm, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r--arch/x86/kernel/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 6209ab6deb50..5335d05b695e 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -26,7 +26,6 @@ KASAN_SANITIZE_dumpstack.o := n
KASAN_SANITIZE_dumpstack_$(BITS).o := n
KASAN_SANITIZE_stacktrace.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