diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-sh/cpu-sh4/cacheflush.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/cpu-sh4/cacheflush.h')
| -rw-r--r-- | include/asm-sh/cpu-sh4/cacheflush.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/include/asm-sh/cpu-sh4/cacheflush.h index 5fd5c89ef86a..065306d376eb 100644 --- a/include/asm-sh/cpu-sh4/cacheflush.h +++ b/include/asm-sh/cpu-sh4/cacheflush.h | |||
| @@ -30,7 +30,6 @@ void flush_dcache_page(struct page *pg); | |||
| 30 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | 30 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) |
| 31 | 31 | ||
| 32 | void flush_icache_range(unsigned long start, unsigned long end); | 32 | void flush_icache_range(unsigned long start, unsigned long end); |
| 33 | void flush_cache_sigtramp(unsigned long addr); | ||
| 34 | void flush_icache_user_range(struct vm_area_struct *vma, struct page *page, | 33 | void flush_icache_user_range(struct vm_area_struct *vma, struct page *page, |
| 35 | unsigned long addr, int len); | 34 | unsigned long addr, int len); |
| 36 | 35 | ||