projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.11-rc5 into staging-next
[cascardo/linux.git]
/
kernel
/
rcu.h
diff --git
a/kernel/rcu.h
b/kernel/rcu.h
index
20dfba5
..
7f8e759
100644
(file)
--- a/
kernel/rcu.h
+++ b/
kernel/rcu.h
@@
-111,4
+111,11
@@
static inline bool __rcu_reclaim(char *rn, struct rcu_head *head)
extern int rcu_expedited;
+#ifdef CONFIG_RCU_STALL_COMMON
+
+extern int rcu_cpu_stall_suppress;
+int rcu_jiffies_till_stall_check(void);
+
+#endif /* #ifdef CONFIG_RCU_STALL_COMMON */
+
#endif /* __LINUX_RCU_H */