Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e508f438 authored Sep 28, 2005 by Stephen Rothwell

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



And rename it to htab.c

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

parent cb5c7980

arch/powerpc/platforms/iseries/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	obj-y += hvlog.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 proc.o		hvcall.o proc.o htab.o

arch/ppc64/kernel/iSeries_htab.c→arch/powerpc/platforms/iseries/htab.c

+13 −12

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,8 @@
	#include <asm/abs_addr.h>		#include <asm/abs_addr.h>
	#include <linux/spinlock.h>		#include <linux/spinlock.h>

	static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp = { [0 ... 63] = SPIN_LOCK_UNLOCKED};		static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =
			{ [0 ... 63] = SPIN_LOCK_UNLOCKED};

	/*		/*
	* Very primitive algorithm for picking up a lock		* Very primitive algorithm for picking up a lock

arch/ppc64/kernel/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)

	obj-$(CONFIG_PPC_ISERIES) += iSeries_htab.o \		obj-$(CONFIG_PPC_ISERIES) += iSeries_iommu.o
	iSeries_iommu.o

	obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o		obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o