Merge to Fedora kernel-2.6.18-1.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / arch / powerpc / kernel / irq.c

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index f53b244..12c5971 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -52,7 +52,6 @@
 #include <linux/radix-tree.h>
 #include <linux/mutex.h>
 #include <linux/bootmem.h>
-#include <linux/vs_context.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -219,9 +218,6 @@ void do_IRQ(struct pt_regs *regs)
        irq = ppc_md.get_irq(regs);
 
        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
-               struct vx_info_save vxis;
-
-               __enter_vx_admin(&vxis);
 #ifdef CONFIG_IRQSTACKS
                /* Switch to the irq stack to handle this */
                curtp = current_thread_info();
@@ -240,7 +236,6 @@ void do_IRQ(struct pt_regs *regs)
                } else
 #endif
                        generic_handle_irq(irq, regs);
-               __leave_vx_admin(&vxis);
        } else if (irq != NO_IRQ_IGNORE)
                /* That's not SMP safe ... but who cares ? */
                ppc_spurious_interrupts++;
@@ -249,7 +244,6 @@ void do_IRQ(struct pt_regs *regs)
 
 #ifdef CONFIG_PPC_ISERIES
        if (get_lppaca()->int_dword.fields.decr_int) {
-
                get_lppaca()->int_dword.fields.decr_int = 0;
                /* Signal a fake decrementer interrupt */
                timer_interrupt(regs);