To: linus, akpm
Cc: lkml
Subject: [PATCH] M68k pgalloc fixup

M68k: Fix build after <asm/pgalloc.h> surgery in 2.6.8-rc1:
  - Add missing include on machines with a standard m68k MMU
  - Convert __pte_free_tlb() to a macro (like it is on most other archs) on
    Sun-3, to avoid include hell

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

---
 motorola_pgalloc.h |    1 +
 sun3_pgalloc.h     |    5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

--- linux-2.6.8-rc2/include/asm-m68k/motorola_pgalloc.h	2003-05-05 10:32:45.000000000 +0200
+++ linux-m68k-2.6.8-rc2/include/asm-m68k/motorola_pgalloc.h	2004-07-18 22:48:35.000000000 +0200
@@ -2,6 +2,7 @@
 #define _MOTOROLA_PGALLOC_H
 
 #include <asm/tlb.h>
+#include <asm/tlbflush.h>
 
 extern pmd_t *get_pointer_table(void);
 extern int free_pointer_table(pmd_t *);
--- linux-2.6.8-rc2/include/asm-m68k/sun3_pgalloc.h	2004-07-15 21:38:16.000000000 +0200
+++ linux-m68k-2.6.8-rc2/include/asm-m68k/sun3_pgalloc.h	2004-07-18 22:53:30.000000000 +0200
@@ -31,10 +31,7 @@
         __free_page(page);
 }
 
-static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
-{
-	tlb_remove_page(tlb, page);
-}
+#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
 
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 					  unsigned long address)