diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:58:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:58:35 -0400 |
| commit | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (patch) | |
| tree | b3d17a2d068737ec07727b28e93c7d374c27721b /kernel/Makefile | |
| parent | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (diff) | |
| parent | b2613e370dbeb69edbff989382fa54f2395aa471 (diff) | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index ca2433e84873..480976275d98 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -11,7 +11,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \ | |||
| 11 | hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ | 11 | hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ |
| 12 | notifier.o ksysfs.o pm_qos_params.o sched_clock.o | 12 | notifier.o ksysfs.o pm_qos_params.o sched_clock.o |
| 13 | 13 | ||
| 14 | CFLAGS_REMOVE_sched.o = -pg -mno-spe | 14 | CFLAGS_REMOVE_sched.o = -mno-spe |
| 15 | 15 | ||
| 16 | ifdef CONFIG_FTRACE | 16 | ifdef CONFIG_FTRACE |
| 17 | # Do not trace debug files and internal ftrace files | 17 | # Do not trace debug files and internal ftrace files |