From linux-kernel@vger.kernel.org Thu Dec 18 21:47:47 2003 Date: Mon, 15 Dec 2003 05:42:19 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [PPC64] Fix compile error in arch/ppc64/kernel/pmc.c. ChangeSet 1.1270.3.10, 2003/12/15 16:42:19+11:00, paulus@quango.ozlabs.ibm.com [PPC64] Fix compile error in arch/ppc64/kernel/pmc.c. # This patch includes the following deltas: # ChangeSet 1.1270.3.9 -> 1.1270.3.10 # arch/ppc64/kernel/pmc.c 1.5 -> 1.6 # include/asm-ppc64/mmu.h 1.4 -> 1.5 # arch/ppc64/kernel/pmc.c | 5 ++--- include/asm-ppc64/mmu.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff -Nru a/arch/ppc64/kernel/pmc.c b/arch/ppc64/kernel/pmc.c --- a/arch/ppc64/kernel/pmc.c Mon Dec 15 07:04:01 2003 +++ b/arch/ppc64/kernel/pmc.c Mon Dec 15 07:04:01 2003 @@ -74,7 +74,6 @@ page_table_lock : SPIN_LOCK_UNLOCKED}; extern spinlock_t hash_table_lock[]; -extern inline unsigned long get_lock_slot(unsigned long vpn); char * ppc64_pmc_stab(int file) @@ -241,7 +240,7 @@ lock_slot = get_lock_slot(vpn); rpn = pa >> PAGE_SHIFT; - spin_lock(&hash_table_lock[lock_slot].lock); + spin_lock(&hash_table_lock[lock_slot]); /* Get a pointer to the linux page table entry for this page * allocating pmd or pte pages along the way as needed. Note * that the pmd & pte pages are not themselfs bolted. @@ -266,7 +265,7 @@ *ptep = pte; - spin_unlock(&hash_table_lock[lock_slot].lock); + spin_unlock(&hash_table_lock[lock_slot]); } spin_unlock(&btmalloc_mm.page_table_lock); diff -Nru a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h --- a/include/asm-ppc64/mmu.h Mon Dec 15 07:04:01 2003 +++ b/include/asm-ppc64/mmu.h Mon Dec 15 07:04:01 2003 @@ -180,7 +180,7 @@ extern HTAB htab_data; #include -#include +#include typedef struct { spinlock_t lock; } ____cacheline_aligned hash_table_lock_t; @@ -191,6 +191,7 @@ unsigned long prpn, unsigned hash, void * ptep, unsigned hpteflags, unsigned bolted ); +unsigned long get_lock_slot(unsigned long vpn); #define PD_SHIFT (10+12) /* Page directory */ #define PD_MASK 0x02FF - To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html