Merge commit 'v2.6.37-rc7' into perf/core

[mv-sheeva.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 223874538b33208e3c5ff11710f3161d58b4aef2..a99d735db3dfe5ee26fba4aebc5261dedfa74af9 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -316,6 +316,7 @@ extern int proc_dowatchdog_thresh(struct ctl_table *table, int write,
                                  size_t *lenp, loff_t *ppos);
 extern unsigned int  softlockup_panic;
 extern int softlockup_thresh;
+void lockup_detector_init(void);
 #else
 static inline void touch_softlockup_watchdog(void)
 {
@@ -326,6 +327,9 @@ static inline void touch_softlockup_watchdog_sync(void)
 static inline void touch_all_softlockup_watchdogs(void)
 {
 }
+static inline void lockup_detector_init(void)
+{
+}
 #endif
 
 #ifdef CONFIG_DETECT_HUNG_TASK