diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 22:32:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 22:32:21 -0400 |
| commit | a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e (patch) | |
| tree | 799e60e111e2f5179c7ffd81483abd1d2397003b /include | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
| parent | 0011036beeffeada15acd1936d67988de21ca65e (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Probe initrd header only if explicitly specified
[MIPS] TX39xx: Add missing local_flush_icache_range initialization
[MIPS] TXx9: Fix txx9_pcode initialization
[MIPS] Fix WARNING: at kernel/smp.c:290
[MIPS] Fix data bus error recovery
Diffstat (limited to 'include')
| -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 d5c0f2fda51b..03b1d69b142f 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, | |||
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | extern void (*flush_icache_range)(unsigned long start, unsigned long end); | 65 | extern void (*flush_icache_range)(unsigned long start, unsigned long end); |
| 66 | extern void (*local_flush_icache_range)(unsigned long start, unsigned long end); | ||
| 66 | 67 | ||
| 67 | extern void (*__flush_cache_vmap)(void); | 68 | extern void (*__flush_cache_vmap)(void); |
| 68 | 69 | ||