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 <b...@kernel.crashing.org> --- v2. Fix issues due to changes in other patches 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(-) --- linux-work.orig/arch/powerpc/mm/tlb_hash64.c 2009-07-24 18:14:35.000000000 +1000 +++ linux-work/arch/powerpc/mm/tlb_hash64.c 2009-07-24 18:14:51.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-24 18:14:35.000000000 +1000 +++ linux-work/arch/powerpc/mm/init_32.c 2009-07-24 18:14:51.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-24 18:14:35.000000000 +1000 +++ linux-work/arch/powerpc/mm/pgtable.c 2009-07-24 18:15:05.000000000 +1000 @@ -30,6 +30,8 @@ #include <asm/tlbflush.h> #include <asm/tlb.h> +DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); + #ifdef CONFIG_SMP /* _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
