diff options
| author | Ingo Molnar | 2008-11-19 09:44:37 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-11-19 09:44:37 +0100 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /kernel/Makefile | |
| parent | sched: add hierarchical accounting to cpu accounting controller (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-qcow2-linux-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.tar.gz kernel-qcow2-linux-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.tar.xz kernel-qcow2-linux-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.zip | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 46e67a398495..6a212b842d86 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -11,8 +11,6 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ notifier.o ksysfs.o pm_qos_params.o sched_clock.o -CFLAGS_REMOVE_sched.o = -mno-spe - ifdef CONFIG_FUNCTION_TRACER # Do not trace debug files and internal ftrace files CFLAGS_REMOVE_lockdep.o = -pg |