From da4f4a02abebb8b6f49e1585acbb23921a5da410 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 11 Mar 2009 16:44:39 +1000 Subject: [PATCH] m68k: merge the mmu and non-mmu versions of tlbflush.h Simple merge of the mmu and non-mmu versions of tlbflush.h Signed-off-by: Greg Ungerer --- .../m68k/include/asm/{tlbflush_mm.h => tlbflush.h} | 50 +++++++++++++++++++- arch/m68k/include/asm/tlbflush_no.h | 55 ---------------------- 2 files changed, 49 insertions(+), 56 deletions(-) rename arch/m68k/include/asm/{tlbflush_mm.h => tlbflush.h} (87%) delete mode 100644 arch/m68k/include/asm/tlbflush_no.h diff --git a/arch/m68k/include/asm/tlbflush_mm.h b/arch/m68k/include/asm/tlbflush.h similarity index 87% rename from arch/m68k/include/asm/tlbflush_mm.h rename to arch/m68k/include/asm/tlbflush.h index acb6bf21a32..a6b4ed4fc90 100644 --- a/arch/m68k/include/asm/tlbflush_mm.h +++ b/arch/m68k/include/asm/tlbflush.h @@ -1,7 +1,7 @@ #ifndef _M68K_TLBFLUSH_H #define _M68K_TLBFLUSH_H - +#ifdef CONFIG_MMU #ifndef CONFIG_SUN3 #include @@ -216,4 +216,52 @@ static inline void flush_tlb_kernel_page (unsigned long addr) #endif +#else /* !CONFIG_MMU */ + +/* + * flush all user-space atc entries. + */ +static inline void __flush_tlb(void) +{ + BUG(); +} + +static inline void __flush_tlb_one(unsigned long addr) +{ + BUG(); +} + +#define flush_tlb() __flush_tlb() + +/* + * flush all atc entries (both kernel and user-space entries). + */ +static inline void flush_tlb_all(void) +{ + BUG(); +} + +static inline void flush_tlb_mm(struct mm_struct *mm) +{ + BUG(); +} + +static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) +{ + BUG(); +} + +static inline void flush_tlb_range(struct mm_struct *mm, + unsigned long start, unsigned long end) +{ + BUG(); +} + +static inline void flush_tlb_kernel_page(unsigned long addr) +{ + BUG(); +} + +#endif /* CONFIG_MMU */ + #endif /* _M68K_TLBFLUSH_H */ diff --git a/arch/m68k/include/asm/tlbflush_no.h b/arch/m68k/include/asm/tlbflush_no.h deleted file mode 100644 index a470cfb803e..00000000000 --- a/arch/m68k/include/asm/tlbflush_no.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _M68KNOMMU_TLBFLUSH_H -#define _M68KNOMMU_TLBFLUSH_H - -/* - * Copyright (C) 2000 Lineo, David McCullough - * Copyright (C) 2000-2002, Greg Ungerer - */ - -#include - -/* - * flush all user-space atc entries. - */ -static inline void __flush_tlb(void) -{ - BUG(); -} - -static inline void __flush_tlb_one(unsigned long addr) -{ - BUG(); -} - -#define flush_tlb() __flush_tlb() - -/* - * flush all atc entries (both kernel and user-space entries). - */ -static inline void flush_tlb_all(void) -{ - BUG(); -} - -static inline void flush_tlb_mm(struct mm_struct *mm) -{ - BUG(); -} - -static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) -{ - BUG(); -} - -static inline void flush_tlb_range(struct mm_struct *mm, - unsigned long start, unsigned long end) -{ - BUG(); -} - -static inline void flush_tlb_kernel_page(unsigned long addr) -{ - BUG(); -} - -#endif /* _M68KNOMMU_TLBFLUSH_H */ -- 2.11.4.GIT