Commit 9fd926b4 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Geert Uytterhoeven

m68k: Fix redefinition of pgprot_noncached

arch/m68k/include/asm/pgtable_mm.h:148:1: warning: "pgprot_noncached" redefined
In file included from arch/m68k/include/asm/pgtable_mm.h:138,
                 from arch/m68k/include/asm/pgtable.h:4,
                 from include/linux/mm.h:40,
                 from include/linux/pagemap.h:7,
                 from include/linux/blkdev.h:12,
                 from arch/m68k/emu/nfblock.c:17:
include/asm-generic/pgtable.h:133:1: warning: this is the location of the previous definition

pgprot_noncached() should be defined _before_ including asm-generic/pgtable.h
Signed-off-by: default avatarAlexey Dobriyan <>
Signed-off-by: default avatarGeert Uytterhoeven <>
parent dc71c7d5
......@@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
#ifndef __ASSEMBLY__
#include <asm-generic/pgtable.h>
* Macro to mark a page protection value as "uncacheable".
......@@ -154,6 +152,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \
: (prot)))
#include <asm-generic/pgtable.h>
#endif /* !__ASSEMBLY__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment