powerpc: Create arch/powerpc/platforms/iseries

I also move arch/ppc64/kernel/HvCall.c to
arch/powerpc/platforms/iseries/hvcall.c.

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

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index dbc093759a893f83a488437cd4e3de7934f5b5be..697addea192f01b257f344a2fa2dcb249f7f948d 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,4 +1,5 @@
-obj-$(CONFIG_PPC_PMAC) += powermac/
-obj-$(CONFIG_4xx)      += 4xx/
-obj-$(CONFIG_83xx)     += 83xx/
-obj-$(CONFIG_85xx)     += 85xx/
+obj-$(CONFIG_PPC_PMAC)         += powermac/
+obj-$(CONFIG_4xx)              += 4xx/
+obj-$(CONFIG_83xx)             += 83xx/
+obj-$(CONFIG_85xx)             += 85xx/
+obj-$(CONFIG_PPC_ISERIES)      += iseries/

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
new file mode 100644 (file)
index 0000000..af0c7d9
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PPC_ISERIES) += hvcall.o

diff --git a/arch/powerpc/platforms/iseries/hvcall.c b/arch/powerpc/platforms/iseries/hvcall.c
new file mode 100644 (file)
index 0000000..f61e2e9
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/hvcall.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2001  Mike Corrigan IBM Corporation
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <asm/page.h>
+#include <asm/abs_addr.h>
+#include <asm/iSeries/HvCall.h>
+#include <asm/iSeries/HvCallSc.h>
+#include <asm/iSeries/HvTypes.h>
+
+
+void HvCall_writeLogBuffer(const void *buffer, u64 len)
+{
+       struct HvLpBufferList hv_buf;
+       u64 left_this_page;
+       u64 cur = virt_to_abs(buffer);
+
+       while (len) {
+               hv_buf.addr = cur;
+               left_this_page = ((cur & PAGE_MASK) + PAGE_SIZE) - cur;
+               if (left_this_page > len)
+                       left_this_page = len;
+               hv_buf.len = left_this_page;
+               len -= left_this_page;
+               HvCall2(HvCallBaseWriteLogBuffer,
+                               virt_to_abs(&hv_buf),
+                               left_this_page);
+               cur = (cur & PAGE_MASK) + PAGE_SIZE;
+       }
+}

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 40675b3f924d43f378a54577faa22059b74275ac..d4eb55f82f0352c37f821264d5fcb8905371186a 100644 (file)
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -84,6 +84,7 @@ head-y := arch/ppc64/kernel/head.o
 libs-y                         += arch/ppc64/lib/
 core-y                         += arch/ppc64/kernel/
 core-y                         += arch/ppc64/mm/
+core-y                         += arch/powerpc/platforms/
 core-$(CONFIG_XMON)            += arch/ppc64/xmon/
 drivers-$(CONFIG_OPROFILE)     += arch/powerpc/oprofile/
 

diff --git a/arch/ppc64/kernel/HvCall.c b/arch/ppc64/kernel/HvCall.c
deleted file mode 100644 (file)
index b772e65..0000000
--- a/arch/ppc64/kernel/HvCall.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * HvCall.c
- * Copyright (C) 2001  Mike Corrigan IBM Corporation
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <asm/page.h>
-#include <asm/abs_addr.h>
-#include <asm/iSeries/HvCall.h>
-#include <asm/iSeries/HvCallSc.h>
-#include <asm/iSeries/HvTypes.h>
-
-
-void HvCall_writeLogBuffer(const void *buffer, u64 len)
-{
-       struct HvLpBufferList hv_buf;
-       u64 left_this_page;
-       u64 cur = virt_to_abs(buffer);
-
-       while (len) {
-               hv_buf.addr = cur;
-               left_this_page = ((cur & PAGE_MASK) + PAGE_SIZE) - cur;
-               if (left_this_page > len)
-                       left_this_page = len;
-               hv_buf.len = left_this_page;
-               len -= left_this_page;
-               HvCall2(HvCallBaseWriteLogBuffer,
-                               virt_to_abs(&hv_buf),
-                               left_this_page);
-               cur = (cur & PAGE_MASK) + PAGE_SIZE;
-       }
-}

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index afadb6e4a6dc9df43293de31a7b9ff6f33452b75..aba3895b74d460267426ef99a991fa955fb03d4e 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -22,7 +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 HvLpConfig.o LparData.o \
+obj-$(CONFIG_PPC_ISERIES) += HvLpConfig.o LparData.o \
                             iSeries_setup.o ItLpQueue.o hvCall.o \
                             mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \
                             iSeries_iommu.o