From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 12 May 2010 21:19:01 +0000 (+0200)
Subject: Merge commit 'v2.6.34-rc7' into perf/nmi
X-Git-Tag: v2.6.36-rc1~532^2~1^2~18
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94

Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.
---

a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94
diff --cc kernel/sysctl.c
index ac72c9e6bd9b,8686b0f5fc12..a38af430f0d8
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -59,11 -61,19 +61,23 @@@
  #include <asm/stacktrace.h>
  #include <asm/io.h>
  #endif
+ #ifdef CONFIG_BSD_PROCESS_ACCT
+ #include <linux/acct.h>
+ #endif
+ #ifdef CONFIG_RT_MUTEXES
+ #include <linux/rtmutex.h>
+ #endif
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
+ #endif
+ #ifdef CONFIG_CHR_DEV_SG
+ #include <scsi/sg.h>
+ #endif
  
 +#ifdef CONFIG_NMI_WATCHDOG
 +#include <linux/nmi.h>
 +#endif
 +
  
  #if defined(CONFIG_SYSCTL)