powerpc: Move iSeries_smp.c to powerpc/platforms/iseries

And rename it to smp.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 3a1ed16963a4332c1f882f3012c2ecd9be92bb2e..202f17419df55c462c70bec9678882147015c159 100644 (file)
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -2,3 +2,4 @@ obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
        hvcall.o proc.o htab.o iommu.o
 obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o
 obj-$(CONFIG_IBMVIO) += vio.o
+obj-$(CONFIG_SMP) += smp.o

diff --git a/arch/ppc64/kernel/iSeries_smp.c b/arch/powerpc/platforms/iseries/smp.c
similarity index 88%
rename from arch/ppc64/kernel/iSeries_smp.c
rename to arch/powerpc/platforms/iseries/smp.c
index f982e5b805f49eb9eb2b293cbcfbfd032798da1b..f720916682f6a70f090e3b18944322525a34c99e 100644 (file)
--- a/arch/ppc64/kernel/iSeries_smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -47,17 +47,17 @@
 
 static unsigned long iSeries_smp_message[NR_CPUS];
 
-void iSeries_smp_message_recv( struct pt_regs * regs )
+void iSeries_smp_message_recv(struct pt_regs *regs)
 {
        int cpu = smp_processor_id();
        int msg;
 
-       if ( num_online_cpus() < 2 )
+       if (num_online_cpus() < 2)
                return;
 
-       for ( msg = 0; msg < 4; ++msg )
-               if ( test_and_clear_bit( msg, &iSeries_smp_message[cpu] ) )
-                       smp_message_recv( msg, regs );
+       for (msg = 0; msg < 4; msg++)
+               if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))
+                       smp_message_recv(msg, regs);
 }
 
 static inline void smp_iSeries_do_message(int cpu, int msg)
@@ -74,8 +74,8 @@ static void smp_iSeries_message_pass(int target, int msg)
                smp_iSeries_do_message(target, msg);
        else {
                for_each_online_cpu(i) {
-                       if (target == MSG_ALL_BUT_SELF
-                           && i == smp_processor_id())
+                       if ((target == MSG_ALL_BUT_SELF) &&
+                                       (i == smp_processor_id()))
                                continue;
                        smp_iSeries_do_message(i, msg);
                }
@@ -89,7 +89,7 @@ static int smp_iSeries_probe(void)
 
 static void smp_iSeries_kick_cpu(int nr)
 {
-       BUG_ON(nr < 0 || nr >= NR_CPUS);
+       BUG_ON((nr < 0) || (nr >= NR_CPUS));
 
        /* Verify that our partition has a processor nr */
        if (paca[nr].lppaca.dyn_proc_status >= 2)

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 7354c1dbe9f01109a82aeace4ed8fa9c38908fd4..ee88fca0c886e7493877c964c03787b501eab154 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -60,7 +60,6 @@ obj-$(CONFIG_U3_DART)         += u3_iommu.o
 
 ifdef CONFIG_SMP
 obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o smp-tbsync.o
-obj-$(CONFIG_PPC_ISERIES)      += iSeries_smp.o
 obj-$(CONFIG_PPC_PSERIES)      += pSeries_smp.o
 obj-$(CONFIG_PPC_BPA)          += pSeries_smp.o
 obj-$(CONFIG_PPC_MAPLE)                += smp-tbsync.o