diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (patch) | |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c /kernel/Makefile | |
| parent | 12a81c8df13c60904febcafcf6b90ca1acb67122 (diff) | |
| parent | eb703f98191a505f78d0066712ad67d5dedc4c90 (diff) | |
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 057472fbc272..ce53fb2bd1d9 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -76,8 +76,8 @@ obj-$(CONFIG_GCOV_KERNEL) += gcov/ | |||
| 76 | obj-$(CONFIG_AUDIT_TREE) += audit_tree.o | 76 | obj-$(CONFIG_AUDIT_TREE) += audit_tree.o |
| 77 | obj-$(CONFIG_KPROBES) += kprobes.o | 77 | obj-$(CONFIG_KPROBES) += kprobes.o |
| 78 | obj-$(CONFIG_KGDB) += debug/ | 78 | obj-$(CONFIG_KGDB) += debug/ |
| 79 | obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o | ||
| 80 | obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o | 79 | obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o |
| 80 | obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o | ||
| 81 | obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ | 81 | obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ |
| 82 | obj-$(CONFIG_SECCOMP) += seccomp.o | 82 | obj-$(CONFIG_SECCOMP) += seccomp.o |
| 83 | obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o | 83 | obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o |