[PATCH] Remove duplicate declarations in arch/ppc64/mm/tlb.c

Ananth N Mavinakayanahalli ananth at in.ibm.com
Wed Oct 19 06:47:16 EST 2005


From: Ananth N Mavinakayanahalli

Looks like pte_freelist_cur and pte_freelist_forced_free are both
declared twice in the same file (mismerge?). Patch removes one set.

Signed-off-by: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
---

 arch/ppc64/mm/tlb.c |    3 ---
 1 files changed, 3 deletions(-)

Index: linux-2.6.14-rc4/arch/ppc64/mm/tlb.c
===================================================================
--- linux-2.6.14-rc4.orig/arch/ppc64/mm/tlb.c	2005-10-10 21:19:19.000000000 -0400
+++ linux-2.6.14-rc4/arch/ppc64/mm/tlb.c	2005-10-18 16:37:48.000000000 -0400
@@ -48,9 +48,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))



More information about the Linuxppc64-dev mailing list