diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:45:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:45:19 +1000 |
| commit | 166f65074c064d72c7b204a28a36c4c4eb6c16fc (patch) | |
| tree | 12a20af44af9ba0bd6719edc12844abea2944adb /include/linux/sched.h | |
| parent | 86f069440050e95ff643228ef1406d6079001166 (diff) | |
| parent | fa9e355c6e40b3c2c91121780efb724722ec7ece (diff) | |
Merge remote branch 'tip/auto-latest'
Conflicts:
Documentation/feature-removal-schedule.txt
kernel/Makefile
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c0151ffd3541..bcac6728c329 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -316,20 +316,16 @@ extern void scheduler_tick(void); extern void sched_show_task(struct task_struct *p); -#ifdef CONFIG_DETECT_SOFTLOCKUP -extern void softlockup_tick(void); +#ifdef CONFIG_LOCKUP_DETECTOR extern void touch_softlockup_watchdog(void); extern void touch_softlockup_watchdog_sync(void); extern void touch_all_softlockup_watchdogs(void); -extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write, - void __user *buffer, - size_t *lenp, loff_t *ppos); +extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, + void __user *buffer, + size_t *lenp, loff_t *ppos); extern unsigned int softlockup_panic; extern int softlockup_thresh; #else -static inline void softlockup_tick(void) -{ -} static inline void touch_softlockup_watchdog(void) { } |