Commit b6b86818 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

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



And rename it to smp.c.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent ed7f2c05

arch/powerpc/platforms/iseries/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/ppc64/kernel/iSeries_smp.c→arch/powerpc/platforms/iseries/smp.c

+8 −8
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void iSeries_smp_message_recv( struct pt_regs * regs ) 
	if (num_online_cpus() < 2)

		return;



	for ( msg = 0; msg < 4; ++msg )

	for (msg = 0; msg < 4; msg++)

		if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))

			smp_message_recv(msg, regs);

}
@@ -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)

arch/ppc64/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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