Merge branch 'perf/nmi' into perf/core
Ingo Molnar [Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)]
Conflicts:
kernel/Makefile

Merge reason: Add the now complete topic, fix the conflict.

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

1  2 
Documentation/kernel-parameters.txt
arch/Kconfig
arch/x86/Kconfig
arch/x86/kernel/traps.c
include/linux/sched.h
kernel/Makefile
kernel/sysctl.c
kernel/timer.c
lib/Kconfig.debug

Simple merge
diff --cc arch/Kconfig
Simple merge
@@@ -53,8 -53,8 +53,9 @@@ config X8
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_HW_BREAKPOINT
 +      select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS
+       select HAVE_PERF_EVENTS_NMI
        select ANON_INODES
        select HAVE_ARCH_KMEMCHECK
        select HAVE_USER_RETURN_NOTIFIER
Simple merge
Simple merge
diff --cc kernel/Makefile
@@@ -75,9 -75,9 +75,9 @@@ obj-$(CONFIG_AUDITSYSCALL) += auditsc.
  obj-$(CONFIG_GCOV_KERNEL) += gcov/
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
  obj-$(CONFIG_KPROBES) += kprobes.o
 -obj-$(CONFIG_KGDB) += kgdb.o
 +obj-$(CONFIG_KGDB) += debug/
- obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
  obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
+ obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o
  obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
  obj-$(CONFIG_SECCOMP) += seccomp.o
  obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
diff --cc kernel/sysctl.c
Simple merge
diff --cc kernel/timer.c
Simple merge
Simple merge