Messages in this thread | | | Date | Mon, 13 Jan 2014 17:17:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/softirq.c between commit c795eb55e740 ("sched/preempt, locking: Rework local_bh_{dis,en}able()") from the tip tree and commit ("softirq: use const char * const for softirq_to_name, whitespace neatening") from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/softirq.c index e60c41d0087a,527520152ad2..000000000000 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@@ -138,10 -149,9 +138,9 @@@ void _local_bh_enable(void WARN_ON_ONCE(in_irq()); __local_bh_enable(SOFTIRQ_DISABLE_OFFSET); } EXPORT_SYMBOL(_local_bh_enable);
-static inline void _local_bh_enable_ip(unsigned long ip) +void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) { WARN_ON_ONCE(in_irq() || irqs_disabled()); #ifdef CONFIG_TRACE_IRQFLAGS @@@ -155,8 -165,8 +154,8 @@@ /* * Keep preemption disabled until we are done with * softirq processing: - */ + */ - preempt_count_sub(SOFTIRQ_DISABLE_OFFSET - 1); + preempt_count_sub(cnt - 1); if (unlikely(!in_interrupt() && local_softirq_pending())) { /* [unhandled content-type:application/pgp-signature] | |