aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-26 16:39:17 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-27 12:28:43 -0400
commit6e15cf04860074ad032e88c306bea656bbdd0f22 (patch)
treec346383bb7563e8d66b2f4a502f875b259c34870 /Makefile
parentbe0ea69674ed95e1e98cb3687a241badc756d228 (diff)
parent60db56422043aaa455ac7f858ce23c273220f9d9 (diff)
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts: arch/parisc/kernel/irq.c arch/x86/include/asm/fixmap_64.h arch/x86/include/asm/setup.h kernel/irq/handle.c Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1ab3ebfc9091..c6307b6d069f 100644
--- a/Makefile
+++ b/Makefile
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
533endif 533endif
534 534
535# Force gcc to behave correct even for buggy distributions 535# Force gcc to behave correct even for buggy distributions
536# Arch Makefiles may override this setting 536ifndef CONFIG_CC_STACKPROTECTOR
537KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) 537KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
538endif
538 539
539ifdef CONFIG_FRAME_POINTER 540ifdef CONFIG_FRAME_POINTER
540KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 541KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls