powerpc: move iSeries_proc.c to powerpc/platforms/iseries

And renamed it to proc.c

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 3a9981a35e2ace3024ba63ddcbda93e1309bc846..0bd671573c8722604cf81945e7fdfcaecfe3aeb6 100644 (file)
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1 +1,2 @@
-obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o hvcall.o
+obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
+       hvcall.o proc.o

diff --git a/arch/ppc64/kernel/iSeries_proc.c b/arch/powerpc/platforms/iseries/proc.c
similarity index 93%
rename from arch/ppc64/kernel/iSeries_proc.c
rename to arch/powerpc/platforms/iseries/proc.c
index 0fe3116eba29c017d66a12ecec53a1df64391d12..d46b473ce4ddad87cea24f9083b0a3ea44865e52 100644 (file)
--- a/arch/ppc64/kernel/iSeries_proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -1,5 +1,4 @@
 /*
- * iSeries_proc.c
  * Copyright (C) 2001  Kyle A. Lucke IBM Corporation
  * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen IBM Corporation
  *
@@ -68,12 +67,15 @@ static int proc_titantod_show(struct seq_file *m, void *v)
                unsigned long tb_ticks = (tb0 - startTb);
                unsigned long titan_jiffies = titan_usec / (1000000/HZ);
                unsigned long titan_jiff_usec = titan_jiffies * (1000000/HZ);
-               unsigned long titan_jiff_rem_usec = titan_usec - titan_jiff_usec;
+               unsigned long titan_jiff_rem_usec =
+                       titan_usec - titan_jiff_usec;
                unsigned long tb_jiffies = tb_ticks / tb_ticks_per_jiffy;
                unsigned long tb_jiff_ticks = tb_jiffies * tb_ticks_per_jiffy;
                unsigned long tb_jiff_rem_ticks = tb_ticks - tb_jiff_ticks;
-               unsigned long tb_jiff_rem_usec = tb_jiff_rem_ticks / tb_ticks_per_usec;
-               unsigned long new_tb_ticks_per_jiffy = (tb_ticks * (1000000/HZ))/titan_usec;
+               unsigned long tb_jiff_rem_usec =
+                       tb_jiff_rem_ticks / tb_ticks_per_usec;
+               unsigned long new_tb_ticks_per_jiffy =
+                       (tb_ticks * (1000000/HZ))/titan_usec;
 
                seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);
                seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index a4e5c5b86c74668b8a73821e2e49b3dd39e64431..271b71d20d15e20f39d2c2c8844de9a17e4616a6 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) += iSeries_proc.o iSeries_htab.o \
+obj-$(CONFIG_PPC_ISERIES) += iSeries_htab.o \
                             iSeries_iommu.o
 
 obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o