Skip to contentSkip to conversation

M68k pgalloc fixup

PATCH New Geert Uytterhoeven 1 participant 1 message Jul 20, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

include/asm-m68k/motorola_pgalloc.h +1 -0
@@ -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 *);
include/asm-m68k/sun3_pgalloc.h +1 -4
@@ -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)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds