From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 12 Dec 2008 11:43:05 +0000 (+0100)
Subject: Merge branch 'tracing/fastboot' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=81444a799550214f549caf579cf65a0ca55e70b7;p=linux-2.6-omap-h63xx.git

Merge branch 'tracing/fastboot' into cpus4096
---

81444a799550214f549caf579cf65a0ca55e70b7
diff --cc kernel/Makefile
index 010ccb31116,19fad003b19..6a212b842d8
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -19,11 -19,8 +19,7 @@@ CFLAGS_REMOVE_mutex-debug.o = -p
  CFLAGS_REMOVE_rtmutex-debug.o = -pg
  CFLAGS_REMOVE_cgroup-debug.o = -pg
  CFLAGS_REMOVE_sched_clock.o = -pg
 -CFLAGS_REMOVE_sched.o = -pg
  endif
- ifdef CONFIG_FUNCTION_RET_TRACER
- CFLAGS_REMOVE_extable.o = -pg # For __kernel_text_address()
- CFLAGS_REMOVE_module.o = -pg # For __module_text_address()
- endif
  
  obj-$(CONFIG_FREEZER) += freezer.o
  obj-$(CONFIG_PROFILING) += profile.o