lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
And rename it to htab.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Stephen Rothwell
2005-09-28 02:28:45 +10:00
parent cb5c7980ab
commit e508f438e0
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/iseries/Makefile
View File

@@ -1,2 +1,2 @@
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

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

@@ -1,6 +1,6 @@
/* /*
* iSeries hashtable management. * iSeries hashtable management.
* Derived from pSeries_htab.c * Derived from pSeries_htab.c
* *
* SMP scalability work: * SMP scalability work:
* Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM * Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM
@@ -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
@@ -143,9 +144,9 @@ static long iSeries_hpte_remove(unsigned long hpte_group)
/* /*
* The HyperVisor expects the "flags" argument in this form: * The HyperVisor expects the "flags" argument in this form:
* bits 0..59 : reserved * bits 0..59 : reserved
* bit 60 : N * bit 60 : N
* bits 61..63 : PP2,PP1,PP0 * bits 61..63 : PP2,PP1,PP0
*/ */
static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp, static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
unsigned long va, int large, int local) unsigned long va, int large, int local)
@@ -249,7 +250,7 @@ void hpte_init_iSeries(void)
ppc_md.hpte_updatepp = iSeries_hpte_updatepp; ppc_md.hpte_updatepp = iSeries_hpte_updatepp;
ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp; ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;
ppc_md.hpte_insert = iSeries_hpte_insert; ppc_md.hpte_insert = iSeries_hpte_insert;
ppc_md.hpte_remove = iSeries_hpte_remove; ppc_md.hpte_remove = iSeries_hpte_remove;
htab_finish_init(); htab_finish_init();
} }

3
arch/ppc64/kernel/Makefile
View File

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