vserver 2.0 rc7

[linux-2.6.git] / arch / parisc / kernel / hpmc.S

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index eeb3950..c412c0a 100644 (file)
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -121,8 +121,7 @@ os_hpmc:
 
        /* Setup stack pointer. */
 
-       ldil    L%PA(hpmc_stack),sp
-       ldo     R%PA(hpmc_stack)(sp),sp
+       load32  PA(hpmc_stack),sp
        
        ldo     128(sp),sp /* leave room for arguments */
 
@@ -135,8 +134,7 @@ os_hpmc:
        mtctl   %r4,ipsw
        mtctl   %r0,pcsq
        mtctl   %r0,pcsq
-       ldil    L%PA(os_hpmc_1),%r4
-       ldo     R%PA(os_hpmc_1)(%r4),%r4
+       load32  PA(os_hpmc_1),%r4
        mtctl   %r4,pcoq
        ldo     4(%r4),%r4
        mtctl   %r4,pcoq
@@ -155,12 +153,9 @@ os_hpmc_1:
 
        ldo     PDC_PIM(%r0), arg0
        ldo     PDC_PIM_HPMC(%r0),arg1          /* Transfer HPMC data */
-       ldil    L%PA(hpmc_raddr),arg2
-       ldo     R%PA(hpmc_raddr)(arg2),arg2
-       ldil    L%PA(hpmc_pim_data),arg3
-       ldo     R%PA(hpmc_pim_data)(arg3),arg3
-       ldil    L%HPMC_PIM_DATA_SIZE,%r4
-       ldo     R%HPMC_PIM_DATA_SIZE(%r4),%r4
+       load32  PA(hpmc_raddr),arg2
+       load32  PA(hpmc_pim_data),arg3
+       load32  HPMC_PIM_DATA_SIZE,%r4
        stw     %r4,-52(sp)
 
        ldil    L%PA(os_hpmc_2), rp
@@ -199,16 +194,13 @@ os_hpmc_3:
 
        ldo     PDC_IODC(%r0),arg0
        ldo     PDC_IODC_READ(%r0),arg1
-       ldil    L%PA(hpmc_raddr),arg2
-       ldo     R%PA(hpmc_raddr)(arg2),arg2
+       load32  PA(hpmc_raddr),arg2
        ldw     BOOT_CONSOLE_HPA_OFFSET(%r0),arg3 /* console hpa */
        ldo     PDC_IODC_RI_INIT(%r0),%r4
        stw     %r4,-52(sp)
-       ldil    L%PA(hpmc_iodc_buf),%r4
-       ldo     R%PA(hpmc_iodc_buf)(%r4),%r4
+       load32  PA(hpmc_iodc_buf),%r4
        stw     %r4,-56(sp)
-       ldil    L%HPMC_IODC_BUF_SIZE,%r4
-       ldo     R%HPMC_IODC_BUF_SIZE(%r4),%r4
+       load32  HPMC_IODC_BUF_SIZE,%r4
        stw     %r4,-60(sp)
 
        ldil    L%PA(os_hpmc_4),rp
@@ -225,16 +217,14 @@ os_hpmc_4:
        ldw     BOOT_CONSOLE_SPA_OFFSET(%r0),arg2  /* console spa */
        depi    0,31,11,arg2                       /* clear bits 21-31    */
        ldo     BOOT_CONSOLE_PATH_OFFSET(%r0),arg3 /* console path */
-       ldil    L%PA(hpmc_raddr),%r4
-       ldo     R%PA(hpmc_raddr)(%r4),%r4
+       load32  PA(hpmc_raddr),%r4
        stw     %r4, -52(sp)
        stw     %r0, -56(sp)                    /* HV                  */
        stw     %r0, -60(sp)                    /* HV                  */
        stw     %r0, -64(sp)                    /* HV                  */
        stw     %r0, -68(sp)                    /* lang, must be zero  */
 
-       ldil    L%PA(hpmc_iodc_buf),%r5
-       ldo     R%PA(hpmc_iodc_buf)(%r5),%r5
+       load32  PA(hpmc_iodc_buf),%r5
        ldil    L%PA(os_hpmc_5),rp
        bv      (%r5)
        ldo     R%PA(os_hpmc_5)(rp),rp
@@ -249,8 +239,7 @@ os_hpmc_5:
         * we don't intend to ever return to user land anyway)
         */
 
-       ldil            L%PA(swapper_pg_dir),%r4
-       ldo             R%PA(swapper_pg_dir)(%r4),%r4
+       load32          PA(swapper_pg_dir),%r4
        mtctl           %r4,%cr24       /* Initialize kernel root pointer */
        mtctl           %r4,%cr25       /* Initialize user root pointer */
 
@@ -265,8 +254,7 @@ os_hpmc_5:
 
        rsm 8,%r0           /* Clear Q bit */
        ldi     1,%r8       /* Set trap code to "1" for HPMC */
-       ldil    L%PA(intr_save), %r1
-       ldo     R%PA(intr_save)(%r1), %r1
+       load32  PA(intr_save),%r1
        be      0(%sr7,%r1)
        nop