From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 19:13:20 +0000 (+0200)
Subject: Merge branch 'linus' into core/generic-dma-coherent
X-Git-Tag: v2.6.27-rc1~3^2~1^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c
diff --cc arch/x86/Kconfig
index 9d4714e0020,96e0c2ebc38..18a58ecfe68
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -23,9 -23,10 +23,11 @@@ config X8
  	select HAVE_OPROFILE
  	select HAVE_KPROBES
  	select HAVE_KRETPROBES
+ 	select HAVE_DYNAMIC_FTRACE
+ 	select HAVE_FTRACE
  	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
  	select HAVE_ARCH_KGDB if !X86_VOYAGER
 +	select HAVE_GENERIC_DMA_COHERENT if X86_32
  
  config ARCH_DEFCONFIG
  	string
diff --cc kernel/Makefile
index 9e287d8ab76,985ddb7da4d..e25ee775dc9
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -69,7 -81,9 +81,10 @@@ obj-$(CONFIG_TASK_DELAY_ACCT) += delaya
  obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
  obj-$(CONFIG_MARKERS) += marker.o
  obj-$(CONFIG_LATENCYTOP) += latencytop.o
 +obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
+ obj-$(CONFIG_FTRACE) += trace/
+ obj-$(CONFIG_TRACING) += trace/
+ obj-$(CONFIG_SMP) += sched_cpupri.o
  
  ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is