From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 8 Dec 2008 14:46:30 +0000 (+0100)
Subject: Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core
X-Git-Tag: firefly_0821_release~13973^2~591
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5aa97e83bcc31a96374d18f5452d53909a16c90;p=firefly-linux-kernel-4.4.55.git

Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core

Merge these pending x86 tree changes into the perfcounters tree
to avoid conflicts.
---

b5aa97e83bcc31a96374d18f5452d53909a16c90
diff --cc arch/x86/kernel/Makefile
index b62a7667828e,ef28c210ebf8,943fe6026c64..3d4346a73a8f
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@@ -11,7 -11,6 -11,8 +11,8 @@@@ ifdef CONFIG_FUNCTION_TRACE
   CFLAGS_REMOVE_tsc.o = -pg
   CFLAGS_REMOVE_rtc.o = -pg
   CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
 + CFLAGS_REMOVE_ftrace.o = -pg
++ CFLAGS_REMOVE_early_printk.o = -pg
   endif
   
   #