Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[pandora-kernel.git] / arch / powerpc / kernel / exceptions-64s.S

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 1667a07..9f8b01d 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -824,12 +824,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
 
        /*
         * hash_page couldn't handle it, set soft interrupt enable back
 
        /*
         * hash_page couldn't handle it, set soft interrupt enable back

-        * to what it was before the trap.  Note that .raw_local_irq_restore
+        * to what it was before the trap.  Note that .arch_local_irq_restore

         * handles any interrupts pending at this point.
         */
        ld      r3,SOFTE(r1)
        TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
         * handles any interrupts pending at this point.
         */
        ld      r3,SOFTE(r1)
        TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)

-       bl      .raw_local_irq_restore
+       bl      .arch_local_irq_restore

        b       11f
 
 /* We have a data breakpoint exception - handle it */
        b       11f
 
 /* We have a data breakpoint exception - handle it */