summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-07-20 20:59:26 +0200
committerIngo Molnar <mingo@elte.hu>2011-07-20 20:59:26 +0200
commitd1e9ae47a0285d3f1699e8219ce50f656243b93f (patch)
tree2f5a68b5ba1677bcd49ee759f09ffc5ccccb1455 /include
parente6625fa48e6580a74b7e700efd7e6463e282810b (diff)
parenta841796f11c90d53dbac773be56b04fbee8af272 (diff)
downloadlinux-3.10-d1e9ae47a0285d3f1699e8219ce50f656243b93f.tar.gz
linux-3.10-d1e9ae47a0285d3f1699e8219ce50f656243b93f.tar.bz2
linux-3.10-d1e9ae47a0285d3f1699e8219ce50f656243b93f.zip
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 496770a9648..76676a407e4 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1254,6 +1254,9 @@ struct task_struct {
#ifdef CONFIG_PREEMPT_RCU
int rcu_read_lock_nesting;
char rcu_read_unlock_special;
+#if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU)
+ int rcu_boosted;
+#endif /* #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) */
struct list_head rcu_node_entry;
#endif /* #ifdef CONFIG_PREEMPT_RCU */
#ifdef CONFIG_TREE_PREEMPT_RCU