diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:05:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:05:10 -0500 |
| commit | f24407d2bde27a4eb75ce5e52069bf4f1ba0e8a5 (patch) | |
| tree | 6ad6dbc0b3d394435615b5e53b7d2ab3bde4c354 /arch/sh | |
| parent | 654451748b779b28077d9058442d0f354251870d (diff) | |
| parent | 73c77e2ccc14413c232c3e0b3aa43a0c4b72ec70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt:
xfs: fix xfs to work with Virtually Indexed architectures
sh: add mm API for DMA to vmalloc/vmap areas
arm: add mm API for DMA to vmalloc/vmap areas
parisc: add mm API for DMA to vmalloc/vmap areas
mm: add coherence API for DMA to vmalloc/vmap areas
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/cacheflush.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/include/asm/cacheflush.h b/arch/sh/include/asm/cacheflush.h index dda96eb3e7c0..da3ebec921a7 100644 --- a/arch/sh/include/asm/cacheflush.h +++ b/arch/sh/include/asm/cacheflush.h | |||
| @@ -63,6 +63,14 @@ static inline void flush_anon_page(struct vm_area_struct *vma, | |||
| 63 | if (boot_cpu_data.dcache.n_aliases && PageAnon(page)) | 63 | if (boot_cpu_data.dcache.n_aliases && PageAnon(page)) |
| 64 | __flush_anon_page(page, vmaddr); | 64 | __flush_anon_page(page, vmaddr); |
| 65 | } | 65 | } |
| 66 | static inline void flush_kernel_vmap_range(void *addr, int size) | ||
| 67 | { | ||
| 68 | __flush_wback_region(addr, size); | ||
| 69 | } | ||
| 70 | static inline void invalidate_kernel_vmap_range(void *addr, int size) | ||
| 71 | { | ||
| 72 | __flush_invalidate_region(addr, size); | ||
| 73 | } | ||
| 66 | 74 | ||
| 67 | #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE | 75 | #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE |
| 68 | static inline void flush_kernel_dcache_page(struct page *page) | 76 | static inline void flush_kernel_dcache_page(struct page *page) |