diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 19:39:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 19:39:55 -0800 |
| commit | a039767f8d7eeb0731c4053d43c0d8caa27d69d0 (patch) | |
| tree | 4c17bbc74fc8fd338e809f4bb54d159a15f11e37 /include | |
| parent | cdb32706f6948238ed6d1d85473c64c27366e9e9 (diff) | |
| parent | 9a876d60a1cc1621708536b7f14e0f02c3e174ff (diff) | |
| download | linux-a039767f8d7eeb0731c4053d43c0d8caa27d69d0.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
sh: include ax88796 in the defconfig for r7785rp
sh: include ax88796 in the defconfig for r7780mp
sh: fix R2D-1 CF support
fb: Orphan imsttfb.
sh: Update mailing list info.
sh: lockless UTLB miss fast-path.
sh: Kill off UTLB flush in fast-path.
sh: Fix copy_{to,from}_user_page() with cache disabled.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh/cacheflush.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/cacheflush.h b/include/asm-sh/cacheflush.h index b91246153b7e..9d528ada3c14 100644 --- a/include/asm-sh/cacheflush.h +++ b/include/asm-sh/cacheflush.h @@ -43,7 +43,7 @@ extern void __flush_purge_region(void *start, int size); extern void __flush_invalidate_region(void *start, int size); #endif -#ifdef CONFIG_CPU_SH4 +#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_CACHE_OFF) extern void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len); |