diff mbox

[17/20] powerpc/mm: Move around mmu_gathers definition on 64-bit

Message ID 20090723060001.54576DDD1B@ozlabs.org
State Superseded
Headers show

Commit Message

Benjamin Herrenschmidt July 23, 2009, 5:59 a.m. UTC
The definition for the global structure mmu_gathers, used by generic code,
is currently defined in multiple places not including anything used by
64-bit Book3E. This changes it by moving to one place common to all
processors.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

 arch/powerpc/mm/init_32.c    |    2 --
 arch/powerpc/mm/pgtable.c    |    2 ++
 arch/powerpc/mm/tlb_hash64.c |    5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)
diff mbox

Patch

--- linux-work.orig/arch/powerpc/mm/tlb_hash64.c	2009-07-23 14:24:47.000000000 +1000
+++ linux-work/arch/powerpc/mm/tlb_hash64.c	2009-07-23 14:34:13.000000000 +1000
@@ -33,11 +33,6 @@ 
 
 DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
 
-/* This is declared as we are using the more or less generic
- * arch/powerpc/include/asm/tlb.h file -- tgall
- */
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * A linux PTE was changed and the corresponding hash table entry
  * neesd to be flushed. This function will either perform the flush
Index: linux-work/arch/powerpc/mm/init_32.c
===================================================================
--- linux-work.orig/arch/powerpc/mm/init_32.c	2009-07-23 14:41:17.000000000 +1000
+++ linux-work/arch/powerpc/mm/init_32.c	2009-07-23 14:41:19.000000000 +1000
@@ -54,8 +54,6 @@ 
 #endif
 #define MAX_LOW_MEM	CONFIG_LOWMEM_SIZE
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 phys_addr_t total_memory;
 phys_addr_t total_lowmem;
 
Index: linux-work/arch/powerpc/mm/pgtable.c
===================================================================
--- linux-work.orig/arch/powerpc/mm/pgtable.c	2009-07-23 14:41:29.000000000 +1000
+++ linux-work/arch/powerpc/mm/pgtable.c	2009-07-23 14:41:38.000000000 +1000
@@ -33,6 +33,8 @@ 
 static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
 static unsigned long pte_freelist_forced_free;
 
+DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+
 struct pte_freelist_batch
 {
 	struct rcu_head	rcu;