With commit cef21210fb133 ("rcu: don't process callbacks when holding
a rcu_read_lock()") the comment in process_pending_softirqs() about
not entering the scheduler should have been moved.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
xen/common/softirq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/common/softirq.c b/xen/common/softirq.c
index eba65c5fc0..063e93cbe3 100644
--- a/xen/common/softirq.c
+++ b/xen/common/softirq.c
@@ -56,6 +56,7 @@ static void __do_softirq(unsigned long ignore_mask)
void process_pending_softirqs(void)
{
+ /* Do not enter scheduler as it can preempt the calling context. */
unsigned long ignore_mask = (1ul << SCHEDULE_SOFTIRQ) |
(1ul << SCHED_SLAVE_SOFTIRQ);
@@ -64,7 +65,6 @@ void process_pending_softirqs(void)
ignore_mask |= 1ul << RCU_SOFTIRQ;
ASSERT(!in_irq() && local_irq_is_enabled());
- /* Do not enter scheduler as it can preempt the calling context. */
__do_softirq(ignore_mask);
}
--
2.16.4