diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-20 14:59:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-20 14:59:26 -0400 |
| commit | d1e9ae47a0285d3f1699e8219ce50f656243b93f (patch) | |
| tree | 2f5a68b5ba1677bcd49ee759f09ffc5ccccb1455 /include/linux | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
| parent | a841796f11c90d53dbac773be56b04fbee8af272 (diff) | |
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/linux')
| -rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 496770a96487..76676a407e4a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1254,6 +1254,9 @@ struct task_struct { | |||
| 1254 | #ifdef CONFIG_PREEMPT_RCU | 1254 | #ifdef CONFIG_PREEMPT_RCU |
| 1255 | int rcu_read_lock_nesting; | 1255 | int rcu_read_lock_nesting; |
| 1256 | char rcu_read_unlock_special; | 1256 | char rcu_read_unlock_special; |
| 1257 | #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) | ||
| 1258 | int rcu_boosted; | ||
| 1259 | #endif /* #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) */ | ||
| 1257 | struct list_head rcu_node_entry; | 1260 | struct list_head rcu_node_entry; |
| 1258 | #endif /* #ifdef CONFIG_PREEMPT_RCU */ | 1261 | #endif /* #ifdef CONFIG_PREEMPT_RCU */ |
| 1259 | #ifdef CONFIG_TREE_PREEMPT_RCU | 1262 | #ifdef CONFIG_TREE_PREEMPT_RCU |