diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /arch/xtensa/include/asm/cacheflush.h | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'arch/xtensa/include/asm/cacheflush.h')
| -rw-r--r-- | arch/xtensa/include/asm/cacheflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/cacheflush.h b/arch/xtensa/include/asm/cacheflush.h index a508f2f73bd7..376cd9d5f455 100644 --- a/arch/xtensa/include/asm/cacheflush.h +++ b/arch/xtensa/include/asm/cacheflush.h | |||
| @@ -115,6 +115,7 @@ extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned lon | |||
| 115 | #define flush_cache_vmap(start,end) do { } while (0) | 115 | #define flush_cache_vmap(start,end) do { } while (0) |
| 116 | #define flush_cache_vunmap(start,end) do { } while (0) | 116 | #define flush_cache_vunmap(start,end) do { } while (0) |
| 117 | 117 | ||
| 118 | #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 | ||
| 118 | #define flush_dcache_page(page) do { } while (0) | 119 | #define flush_dcache_page(page) do { } while (0) |
| 119 | 120 | ||
| 120 | #define flush_cache_page(vma,addr,pfn) do { } while (0) | 121 | #define flush_cache_page(vma,addr,pfn) do { } while (0) |