Commit c884116a authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Remove duplicate variable definitions in mm/tlb_64.c 



Somewhere along the way (e28f7faf,
"Four level pagetables for ppc64") we ended up with duplicate
definitions for pte_freelist_cur and pte_freelist_force_free.
Somehow this compiles, but it would be better to just have one
definition for each.

The two definitions we end up with can be static too!

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 572fb578

arch/powerpc/mm/tlb_64.c

+2 −5
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch); 
 * include/asm-powerpc/tlb.h file -- tgall

 */

DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);

DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);

unsigned long pte_freelist_forced_free;

static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);

static unsigned long pte_freelist_forced_free;



struct pte_freelist_batch

{
@@ -47,9 +47,6 @@ struct pte_freelist_batch 
	pgtable_free_t	tables[0];

};



DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);

unsigned long pte_freelist_forced_free;



#define PTE_FREELIST_SIZE \

	((PAGE_SIZE - sizeof(struct pte_freelist_batch)) \

	  / sizeof(pgtable_free_t))