It is no longer needed to define them on our own. Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Richard Weinberger <richard@xxxxxx> Cc: linux-m68k@xxxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Richard Weinberger <richard@xxxxxx> --- arch/m68k/include/asm/tlb.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/arch/m68k/include/asm/tlb.h b/arch/m68k/include/asm/tlb.h index 1785cff..74c15f6 100644 --- a/arch/m68k/include/asm/tlb.h +++ b/arch/m68k/include/asm/tlb.h @@ -1,19 +1,11 @@ #ifndef _M68K_TLB_H #define _M68K_TLB_H -/* - * m68k doesn't need any special per-pte or - * per-vma handling.. - */ -#define tlb_start_vma(tlb, vma) do { } while (0) -#define tlb_end_vma(tlb, vma) do { } while (0) -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0) - -/* - * .. because we flush the whole mm when it - * fills up. - */ -#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) +#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3) +/* These defines are needed to override the defaults from asm-generic/tlb.h */ +#define __pte_free_tlb __pte_free_tlb +#define __pmd_free_tlb __pmd_free_tlb +#endif #include <asm-generic/tlb.h> -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html