Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / iseries / misc.S

diff --git a/arch/powerpc/platforms/iseries/misc.S b/arch/powerpc/platforms/iseries/misc.S
index dfe7aa1ba098facedbd1294dd6d1a26c8616ef1a..7641fc7e550a0ec1603dabab9cc917a8dfecdb72 100644 (file)
--- a/arch/powerpc/platforms/iseries/misc.S
+++ b/arch/powerpc/platforms/iseries/misc.S
@@ -44,7 +44,8 @@ _GLOBAL(local_irq_restore)
        /* Check pending interrupts */
        /*   A decrementer, IPI or PMC interrupt may have occurred
         *   while we were in the hypervisor (which enables) */
-       ld      r4,PACALPPACA+LPPACAANYINT(r13)
+       ld      r4,PACALPPACAPTR(r13)
+       ld      r4,LPPACAANYINT(r4)
        cmpdi   r4,0
        beqlr