diff options
| author | James Morris <jmorris@namei.org> | 2008-09-21 17:41:56 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-21 17:41:56 -0700 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /include/asm-mips/cacheflush.h | |
| parent | f058925b201357fba48d56cc9c1719ae274b2022 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | kernel-crypto-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.gz kernel-crypto-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz kernel-crypto-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/asm-mips/cacheflush.h')
| -rw-r--r-- | include/asm-mips/cacheflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h index d5c0f2fda51..03b1d69b142 100644 --- a/include/asm-mips/cacheflush.h +++ b/include/asm-mips/cacheflush.h @@ -63,6 +63,7 @@ static inline void flush_icache_page(struct vm_area_struct *vma, } extern void (*flush_icache_range)(unsigned long start, unsigned long end); +extern void (*local_flush_icache_range)(unsigned long start, unsigned long end); extern void (*__flush_cache_vmap)(void); |