diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 16:48:05 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 16:48:05 +0300 |
commit | 34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch) | |
tree | fee2be2e3453e246ee55ffb711a36a8ec053361a /arch/c6x/include/asm/pgtable.h | |
parent | e79d74ab25339437447478e4dfe2b35c5b560512 (diff) | |
parent | cc261738add93947d138d2fabad9f4dbed4e5c00 (diff) | |
download | linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.tar.xz |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/c6x/include/asm/pgtable.h')
-rw-r--r-- | arch/c6x/include/asm/pgtable.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/c6x/include/asm/pgtable.h b/arch/c6x/include/asm/pgtable.h index 78d4483ba40c..ec4db6df5e0d 100644 --- a/arch/c6x/include/asm/pgtable.h +++ b/arch/c6x/include/asm/pgtable.h @@ -67,6 +67,11 @@ extern unsigned long empty_zero_page; */ #define pgtable_cache_init() do { } while (0) +/* + * c6x is !MMU, so define the simpliest implementation + */ +#define pgprot_writecombine pgprot_noncached + #include <asm-generic/pgtable.h> #endif /* _ASM_C6X_PGTABLE_H */ |