Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Somewhere along the way (e28f7faf05159f1cfd564596f5e6178edba6bd49,
"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: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Michael Ellerman and committed by
Paul Mackerras
c884116a 572fb578

+2 -5
+2 -5
arch/powerpc/mm/tlb_64.c
··· 37 37 * include/asm-powerpc/tlb.h file -- tgall 38 38 */ 39 39 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 40 - DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur); 41 - unsigned long pte_freelist_forced_free; 40 + static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur); 41 + static unsigned long pte_freelist_forced_free; 42 42 43 43 struct pte_freelist_batch 44 44 { ··· 46 46 unsigned int index; 47 47 pgtable_free_t tables[0]; 48 48 }; 49 - 50 - DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur); 51 - unsigned long pte_freelist_forced_free; 52 49 53 50 #define PTE_FREELIST_SIZE \ 54 51 ((PAGE_SIZE - sizeof(struct pte_freelist_batch)) \