powerpc: move hvCall.s to powerpc/platforms/iseries

Rename it to hvcall.S and (so I can do that) rename hvcall.c
to hvlog.c - a more appropriate name.

Do some white space cleanups.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index a5e91c9db5c7f898d17cee6930eb4f6a7224ee02..3a9981a35e2ace3024ba63ddcbda93e1309bc846 100644 (file)
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1 +1 @@
-obj-y += hvcall.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o
+obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o hvcall.o

diff --git a/arch/ppc64/kernel/hvCall.S b/arch/powerpc/platforms/iseries/hvcall.S
similarity index 96%
rename from arch/ppc64/kernel/hvCall.S
rename to arch/powerpc/platforms/iseries/hvcall.S
index 4c699eab1b95cb08dcac0b9f5bb02796c96b64d8..9901c0ec1415c575f53aa837f9f4e80aed82bc49 100644 (file)
--- a/arch/ppc64/kernel/hvCall.S
+++ b/arch/powerpc/platforms/iseries/hvcall.S
@@ -1,7 +1,4 @@
 /*
- * arch/ppc64/kernel/hvCall.S
- *
- *
  * This file contains the code to perform calls to the
  * iSeries LPAR hypervisor
  *
@@ -16,12 +13,12 @@
 
        .text
 
-/* 
+/*
  * Hypervisor call
- * 
+ *
  * Invoke the iSeries hypervisor via the System Call instruction
  * Parameters are passed to this routine in registers r3 - r10
- * 
+ *
  * r3 contains the HV function to be called
  * r4-r10 contain the operands to the hypervisor function
  *
@@ -41,11 +38,11 @@ _GLOBAL(HvCall7)
        mfcr    r0
        std     r0,-8(r1)
        stdu    r1,-(STACK_FRAME_OVERHEAD+16)(r1)
-       
+
        /* r0 = 0xffffffffffffffff indicates a hypervisor call */
-       
+
        li      r0,-1
-       
+
        /* Invoke the hypervisor */
 
        sc
@@ -55,7 +52,7 @@ _GLOBAL(HvCall7)
        mtcrf   0xff,r0
 
        /*  return to caller, return value in r3 */
-       
+
        blr
 
 _GLOBAL(HvCall0Ret16)
@@ -92,7 +89,5 @@ _GLOBAL(HvCall7Ret16)
        ld      r0,-8(r1)
        mtcrf   0xff,r0
        ld      r31,-16(r1)
-       
-       blr
-
 
+       blr

diff --git a/arch/powerpc/platforms/iseries/hvcall.c b/arch/powerpc/platforms/iseries/hvlog.c
similarity index 100%
rename from arch/powerpc/platforms/iseries/hvcall.c
rename to arch/powerpc/platforms/iseries/hvlog.c

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index e3bce4dda502d1bcc9880aca1c05d1c0487e8103..f84ae358db0a2f15cc5bd8e48289ef0a145af95d 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -22,8 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM)   += pci_dn.o pci_direct_iommu.o
 
 obj-$(CONFIG_PCI)      += pci.o pci_iommu.o iomap.o $(pci-obj-y)
 
-obj-$(CONFIG_PPC_ISERIES) += hvCall.o \
-                            HvLpEvent.o iSeries_proc.o iSeries_htab.o \
+obj-$(CONFIG_PPC_ISERIES) += HvLpEvent.o iSeries_proc.o iSeries_htab.o \
                             iSeries_iommu.o
 
 obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o