From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Aug 2010 06:45:05 +0000 (+0200)
Subject: Merge branch 'perf/nmi' into perf/core
X-Git-Tag: v2.6.36-rc1~41^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61be7fdec2f51b99570cd5dcc30c7848c8e56513;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

61be7fdec2f51b99570cd5dcc30c7848c8e56513
diff --cc arch/x86/Kconfig
index dcb0593,3cb5bb0..6f77afa
--- a/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 kernel/Makefile
index 057472f,6adeafc..ce53fb2
--- a/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