diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-07-09 17:08:38 +0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-08-26 23:14:49 +0200 |
| commit | 9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88 (patch) | |
| tree | f40de3049c6d25732dfd844b4cb703629899da32 /arch/m68k | |
| parent | dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8 (diff) | |
| download | op-kernel-dev-9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88.zip op-kernel-dev-9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88.tar.gz | |
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: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/pgtable_mm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h index 0b604f0..fe60e1a 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h @@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, #endif #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__ */ /* |
