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>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index dcb0593b4a66348a204a44fee3366c5da0848ad1,3cb5bb02172bcc14ac6834c590b6d061c2e48026..6f77afa6bca92203a338badf7e25a3fe01ab4e57
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -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

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/Makefile
index 057472fbc272eed8b64f23c16f55b49217aa9043,6adeafc3e2598c26fd5e03070e7307a1b1052a77..ce53fb2bd1d90669caab50084cfac710c620c946
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/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

diff --cc lib/Kconfig.debug
Simple merge