From f4674e91f9069c0a8263efa05b0929fe09250502 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2005 00:17:40 +1000
Subject: [PATCH] --- yaml --- r: 11487 b: refs/heads/master c:
 99a2379cdddcc4e8579e70deb80479450ed65d49 h: refs/heads/master i:   11485:
 4a51e90d12ce9f252d4a712299c92742dff348d5   11483:
 988a804629f03042f83cb99cf52d7cf9f55161a0   11479:
 1ccb24d556820f174f8201fafc7cba8129d29e48   11471:
 16c57d14e43e9d09fd7d1a08b75f1a6353ef1fe0   11455:
 68b8f0fba87335d2ea44a0df9acb3d4cea8edae7 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/powerpc/platforms/iseries/Makefile |  2 +-
 .../platforms/iseries/hvcall.S}               | 21 +++++++------------
 .../platforms/iseries/{hvcall.c => hvlog.c}   |  0
 trunk/arch/ppc64/kernel/Makefile              |  3 +--
 5 files changed, 11 insertions(+), 17 deletions(-)
 rename trunk/arch/{ppc64/kernel/hvCall.S => powerpc/platforms/iseries/hvcall.S} (96%)
 rename trunk/arch/powerpc/platforms/iseries/{hvcall.c => hvlog.c} (100%)

diff --git a/[refs] b/[refs]
index bc2f9c287d13..262b4c376f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2952bc7c896ec76a20e18321e2be40a694a73a78
+refs/heads/master: 99a2379cdddcc4e8579e70deb80479450ed65d49
diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/arch/powerpc/platforms/iseries/Makefile
index a5e91c9db5c7..3a9981a35e2a 100644
--- a/trunk/arch/powerpc/platforms/iseries/Makefile
+++ b/trunk/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/trunk/arch/ppc64/kernel/hvCall.S b/trunk/arch/powerpc/platforms/iseries/hvcall.S
similarity index 96%
rename from trunk/arch/ppc64/kernel/hvCall.S
rename to trunk/arch/powerpc/platforms/iseries/hvcall.S
index 4c699eab1b95..9901c0ec1415 100644
--- a/trunk/arch/ppc64/kernel/hvCall.S
+++ b/trunk/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/trunk/arch/powerpc/platforms/iseries/hvcall.c b/trunk/arch/powerpc/platforms/iseries/hvlog.c
similarity index 100%
rename from trunk/arch/powerpc/platforms/iseries/hvcall.c
rename to trunk/arch/powerpc/platforms/iseries/hvlog.c
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
index e3bce4dda502..f84ae358db0a 100644
--- a/trunk/arch/ppc64/kernel/Makefile
+++ b/trunk/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