summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-04 16:07:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-04 16:07:41 -0800
commitaa16cd8d12352ccb5b921995ab3901110779f24a (patch)
treebc93b1e96dda7e1dc6f1aff498767c627f2de638 /include
parenta3a71ca9a715776cf3eda605dafdb4a383782c4f (diff)
parent59647b6ac3050dd964bc556fe6ef22f4db5b935c (diff)
downloadop-kernel-dev-aa16cd8d12352ccb5b921995ab3901110779f24a.zip
op-kernel-dev-aa16cd8d12352ccb5b921995ab3901110779f24a.tar.gz
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Handle futex value corruption gracefully futex: Handle user space corruption gracefully futex_lock_pi() key refcnt fix softlockup: Add sched_clock_tick() to avoid kernel warning on kgdb resume
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index abdfacc..78efe7c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -310,6 +310,7 @@ extern void sched_show_task(struct task_struct *p);
#ifdef CONFIG_DETECT_SOFTLOCKUP
extern void softlockup_tick(void);
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,
@@ -323,6 +324,9 @@ static inline void softlockup_tick(void)
static inline void touch_softlockup_watchdog(void)
{
}
+static inline void touch_softlockup_watchdog_sync(void)
+{
+}
static inline void touch_all_softlockup_watchdogs(void)
{
}
OpenPOWER on IntegriCloud