diff options
| author |   Michael Ellerman <michael@ellerman.id.au> | 2008-05-08 14:27:09 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2008-05-14 22:31:49 +1000 |
| commit | c884116ac375c5dd137109b58acaa9cf50164796 (patch) | |
| tree | 4ff84580e67c3b164baaa2c7c70b75f51d332411 /arch/powerpc/mm/tlb_64.c | |
| parent | [POWERPC] Move declaration of tce variables into mmu-hash64.h (diff) | |
| download | linux-dev-c884116ac375c5dd137109b58acaa9cf50164796.tar.xz linux-dev-c884116ac375c5dd137109b58acaa9cf50164796.zip | |
[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>
Diffstat (limited to 'arch/powerpc/mm/tlb_64.c')
| -rw-r--r-- | arch/powerpc/mm/tlb_64.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c index e2d867ce1c7e..509bc560159b 100644 --- a/arch/powerpc/mm/tlb_64.c +++ b/arch/powerpc/mm/tlb_64.c @@ -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)) |