History

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

Linus Torvalds committed 15 years ago

Commit cf6ace12 parents acc11ea d1e9ae45 files · +103 −28Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/sched.h+3−0
@@ -1260,6 +1260,9 @@ struct task_struct { · 1259 unmodified lines
12601260 #ifdef CONFIG_PREEMPT_RCU
12611261 int rcu_read_lock_nesting;
12621262 char rcu_read_unlock_special;
1263+#if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU)
1264+ int rcu_boosted;
1265+#endif /* #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) */
12631266 struct list_head rcu_node_entry;
12641267 #endif /* #ifdef CONFIG_PREEMPT_RCU */
12651268 #ifdef CONFIG_TREE_PREEMPT_RCU