Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / alpha / kernel / err_titan.c

diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
index 2e6e6293332751bb1c3aee5d40eea11deb4ba808..febe71c6869fae5b8f7baea4751611c026d596c4 100644 (file)
--- a/arch/alpha/kernel/err_titan.c
+++ b/arch/alpha/kernel/err_titan.c
@@ -452,7 +452,7 @@ titan_machine_check(u64 vector, u64 la_ptr)
                 * machine checks to interrupts
                 */
                irqmask = tmchk->c_dirx & TITAN_MCHECK_INTERRUPT_MASK;
-               titan_dispatch_irqs(irqmask, get_irq_regs());
+               titan_dispatch_irqs(irqmask);
        }       
 
 
@@ -746,7 +746,7 @@ privateer_machine_check(u64 vector, u64 la_ptr)
        /*
         * Dispatch the interrupt(s).
         */
-       titan_dispatch_irqs(irqmask, get_irq_regs());
+       titan_dispatch_irqs(irqmask);
 
        /* 
         * Release the logout frame.