diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /include/asm-mips/cacheflush.h | |
parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/cacheflush.h')
-rw-r--r-- | include/asm-mips/cacheflush.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h index 4933b4947ed0..01e7eadc97e2 100644 --- a/include/asm-mips/cacheflush.h +++ b/include/asm-mips/cacheflush.h | |||
@@ -93,7 +93,7 @@ extern void (*flush_data_cache_page)(unsigned long addr); | |||
93 | clear_bit(PG_dcache_dirty, &(page)->flags) | 93 | clear_bit(PG_dcache_dirty, &(page)->flags) |
94 | 94 | ||
95 | /* Run kernel code uncached, useful for cache probing functions. */ | 95 | /* Run kernel code uncached, useful for cache probing functions. */ |
96 | unsigned long __init run_uncached(void *func); | 96 | unsigned long run_uncached(void *func); |
97 | 97 | ||
98 | extern void *kmap_coherent(struct page *page, unsigned long addr); | 98 | extern void *kmap_coherent(struct page *page, unsigned long addr); |
99 | extern void kunmap_coherent(void); | 99 | extern void kunmap_coherent(void); |