diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 15:56:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 15:56:25 -0700 |
| commit | cf6ace16a3cd8b728fb0afa68368fd40bbeae19f (patch) | |
| tree | 489c64380668e8c5a29d3f36f37554e4b081a647 /include/linux | |
| parent | acc11eab70591744369722280c9ce162a6193494 (diff) | |
| parent | d1e9ae47a0285d3f1699e8219ce50f656243b93f (diff) | |
| download | blackbird-op-linux-cf6ace16a3cd8b728fb0afa68368fd40bbeae19f.tar.gz blackbird-op-linux-cf6ace16a3cd8b728fb0afa68368fd40bbeae19f.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
signal: align __lock_task_sighand() irq disabling and RCU
softirq,rcu: Inform RCU of irq_exit() activity
sched: Add irq_{enter,exit}() to scheduler_ipi()
rcu: protect __rcu_read_unlock() against scheduler-using irq handlers
rcu: Streamline code produced by __rcu_read_unlock()
rcu: Fix RCU_BOOST race handling current->rcu_read_unlock_special
rcu: decrease rcu_report_exp_rnp coupling with scheduler
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 bde99d5358dc..14a6c7b545de 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1260,6 +1260,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 |
