1 files changed, 16 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 292163f5b39a..425616f92d18 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -114,7 +114,7 @@ static inline void set_soft_enabled(unsigned long enable)
         : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
 }
 
-void local_irq_restore(unsigned long en)
+void raw_local_irq_restore(unsigned long en)
 {
         /*
          * get_paca()->soft_enabled = en;
@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en)
 
         __hard_irq_enable();
 }
+EXPORT_SYMBOL(raw_local_irq_restore);
 #endif /* CONFIG_PPC64 */
 
 int show_interrupts(struct seq_file *p, void *v)
@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs)
                                 handler = &__do_IRQ;
                         irqtp->task = curtp->task;
                         irqtp->flags = 0;
+
+                        /* Copy the softirq bits in preempt_count so that the
+                         * softirq checks work in the hardirq context.
+                         */
+                        irqtp->preempt_count =
+                                (irqtp->preempt_count & ~SOFTIRQ_MASK) |
+                                (curtp->preempt_count & SOFTIRQ_MASK);
+
                         call_handle_irq(irq, desc, irqtp, handler);
                         irqtp->task = NULL;
+
+
+                        /* Set any flag that may have been set on the
+                         * alternate stack
+                         */
                         if (irqtp->flags)
                                 set_bits(irqtp->flags, &curtp->flags);
                 } else
@@ -357,7 +371,7 @@ void irq_ctx_init(void)
                 memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
                 tp = softirq_ctx[i];
                 tp->cpu = i;
-                tp->preempt_count = SOFTIRQ_OFFSET;
+                tp->preempt_count = 0;
 
                 memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
                 tp = hardirq_ctx[i];