Re: 2.6.13-rc3-mm3

[Andrew Morton <akpm@osdl.org>]

Richard Purdie <rpurdie@rpsys.net> wrote:
>
> On Thu, 2005-07-28 at 02:58 -0700, Andrew Morton wrote:
>  > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/
>  > 
>  > - There's a pretty large x86_64 update here which naughty maintainer wants
>  >   in 2.6.13.  Extra testing, please.
>  >
>  > +x86_64-switch-to-the-interrupt-stack-when-running-a.patch
> 
>  The above patch causes the BUG below on the Zaurus (arm pxa255 with
>  preempt enabled). This can only be due to the suspicious looking changes
>  to kernel/softirq.c in that patch...

err, yes.  I assume this was some debugging stuff which leaked through.  I
hope x86_64 still works after we fix it...

--- devel/kernel/softirq.c~revert-bogus-softirq-changes	2005-07-30 10:03:12.000000000 -0700
+++ devel-akpm/kernel/softirq.c	2005-07-30 10:03:21.000000000 -0700
@@ -86,7 +86,7 @@ restart:
 	/* Reset the pending bitmask before enabling irqs */
 	local_softirq_pending() = 0;
 
-	//local_irq_enable();
+	local_irq_enable();
 
 	h = softirq_vec;
 
@@ -99,7 +99,7 @@ restart:
 		pending >>= 1;
 	} while (pending);
 
-	//local_irq_disable();
+	local_irq_disable();
 
 	pending = local_softirq_pending();
 	if (pending && --max_restart)
_