[PATCH] ppc64: change HSC -> HVSC

From: anton@samba.org

change HSC -> HVSC

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 6a16bfac8ad5cec49fe971ddc6beeda7cae1dbac..893e254b117cef41f7d366b5e85350b03b4e9206 100644 (file)
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -52,7 +52,7 @@
 /*
  * hcall interface to pSeries LPAR
  */
-#define HSC .long 0x44000022
+#define HVSC .long 0x44000022
 #define H_SET_ASR              0x30
 
 /*
@@ -1743,7 +1743,7 @@ _GLOBAL(__secondary_start)
        cmpwi   r3,0x34         /* Pulsar */
        bne     98f
 97:    li      r3,H_SET_ASR    /* hcall = H_SET_ASR */
-       HSC                     /* Invoking hcall */
+       HVSC                    /* Invoking hcall */
        b       99f
 98:                             /* !(rpa hypervisor) || !(star)  */
        mtasr   r4              /* set the stab location         */
@@ -1912,7 +1912,7 @@ _STATIC(start_here_pSeries)
        cmpwi   r3,0x34         /* Pulsar */
        bne     98f
 97:    li      r3,H_SET_ASR    /* hcall = H_SET_ASR */
-       HSC                     /* Invoking hcall */
+       HVSC                    /* Invoking hcall */
        b       99f
 98:                             /* !(rpa hypervisor) || !(star) */
        mtasr   r4              /* set the stab location         */

diff --git a/arch/ppc64/kernel/pSeries_hvCall.S b/arch/ppc64/kernel/pSeries_hvCall.S
index 5e18e96afff43a5271980c74409f81bf765e3d72..df604cfcf9d4bf0d08856fd1bbe0c57db3ea0ecd 100644 (file)
--- a/arch/ppc64/kernel/pSeries_hvCall.S
+++ b/arch/ppc64/kernel/pSeries_hvCall.S
@@ -22,7 +22,7 @@
 /*
  * hcall interface to pSeries LPAR
  */
-#define HSC .long 0x44000022
+#define HVSC .long 0x44000022
 
 /* long plpar_hcall(unsigned long opcode,       R3 
                 unsigned long arg1,             R4 
@@ -44,7 +44,7 @@ _GLOBAL(plpar_hcall)
         std     r9,-16(r1)
         std     r10,-24(r1)
        
-       HSC                     /* invoke the hypervisor */
+       HVSC                    /* invoke the hypervisor */
 
         ld      r10,-8(r1)      /* Fetch r4-r7 ret args. */
         std     r4,0(r10)
@@ -63,7 +63,7 @@ _GLOBAL(plpar_hcall)
 _GLOBAL(plpar_hcall_norets)
        mfcr    r0
        std     r0,-8(r1)
-       HSC                     /* invoke the hypervisor */
+       HVSC                    /* invoke the hypervisor */
        ld      r0,-8(r1)
        mtcrf   0xff,r0
        blr                     /* return r3 = status */
@@ -94,7 +94,7 @@ _GLOBAL(plpar_hcall_8arg_2ret)
 
         std     r12,-8(r1)      /* Save out ptr */
        
-       HSC                    /* invoke the hypervisor */
+       HVSC                    /* invoke the hypervisor */
 
         ld      r10,-8(r1)      /* Fetch r4 ret arg */
         std     r4,0(r10)
@@ -126,7 +126,7 @@ _GLOBAL(plpar_hcall_4out)
        std     r10,16(r1)
        std     r14,8(r1)
        
-       HSC                    /* invoke the hypervisor */
+       HVSC                    /* invoke the hypervisor */
 
        ld      r14,32(r1)      /* Fetch r4-r7 ret args. */
        std     r4,0(r14)

diff --git a/include/asm-ppc64/hvcall.h b/include/asm-ppc64/hvcall.h
index 5ddaf54741662170ea5eff07d5d1d40e98b5be35..482ca2220b31a4b8435030e686a57bf84ac93792 100644 (file)
--- a/include/asm-ppc64/hvcall.h
+++ b/include/asm-ppc64/hvcall.h
@@ -102,6 +102,8 @@ long plpar_hcall(unsigned long opcode,
                 unsigned long *out2,
                 unsigned long *out3);
 
+#define HVSC                   ".long 0x44000022\n"
+
 /* Same as plpar_hcall but for those opcodes that return no values
  * other than status.  Slightly more efficient.
  */