diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/mn10300/include/asm/cacheflush.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/mn10300/include/asm/cacheflush.h')
| -rw-r--r-- | arch/mn10300/include/asm/cacheflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h index 1a55d61f0d0..29e692f7f03 100644 --- a/arch/mn10300/include/asm/cacheflush.h +++ b/arch/mn10300/include/asm/cacheflush.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define flush_cache_page(vma, vmaddr, pfn) do {} while (0) | 26 | #define flush_cache_page(vma, vmaddr, pfn) do {} while (0) |
| 27 | #define flush_cache_vmap(start, end) do {} while (0) | 27 | #define flush_cache_vmap(start, end) do {} while (0) |
| 28 | #define flush_cache_vunmap(start, end) do {} while (0) | 28 | #define flush_cache_vunmap(start, end) do {} while (0) |
| 29 | #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 | ||
| 29 | #define flush_dcache_page(page) do {} while (0) | 30 | #define flush_dcache_page(page) do {} while (0) |
| 30 | #define flush_dcache_mmap_lock(mapping) do {} while (0) | 31 | #define flush_dcache_mmap_lock(mapping) do {} while (0) |
| 31 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) | 32 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) |