Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c70f5d66 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] revert bogus softirq changes 



This snuck in with an x86_64 change.  Thanks to Richard Purdie
<rpurdie@rpsys.net> for spotting it.

Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6d1d07e4

kernel/softirq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ asmlinkage void __do_softirq(void) 
	/* Reset the pending bitmask before enabling irqs */

	/* Reset the pending bitmask before enabling irqs */

	local_softirq_pending() = 0;

	local_softirq_pending() = 0;





	//local_irq_enable();

	local_irq_enable();





	h = softirq_vec;

	h = softirq_vec;
@@ -99,7 +99,7 @@ asmlinkage void __do_softirq(void) 
		pending >>= 1;

		pending >>= 1;

	} while (pending);

	} while (pending);





	//local_irq_disable();

	local_irq_disable();





	pending = local_softirq_pending();

	pending = local_softirq_pending();

	if (pending && --max_restart)

	if (pending && --max_restart)