summaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/c-r4k.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 14:54:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 14:54:07 -0700
commitff09e2afe742f3ff52a0c9a660e8a3fe30cf587c (patch)
treeaff06e82c7d653d0b15c1f3cae7f0c8a90ba3d14 /arch/mips/mm/c-r4k.c
parentad3c7e42e33a842cf3b518e21a7f69e167649d8a (diff)
parent9c5a3d729cf430609d091ff610a7db363aafcd47 (diff)
downloadkernel-crypto-ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c.tar.gz
kernel-crypto-ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c.tar.xz
kernel-crypto-ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c.zip
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus: [MIPS] Handle aliases in vmalloc correctly.
Diffstat (limited to 'arch/mips/mm/c-r4k.c')
-rw-r--r--arch/mips/mm/c-r4k.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 6496925b5e2..77aefb4ebed 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -361,6 +361,16 @@ static inline int has_valid_asid(const struct mm_struct *mm)
#endif
}
+static void r4k__flush_cache_vmap(void)
+{
+ r4k_blast_dcache();
+}
+
+static void r4k__flush_cache_vunmap(void)
+{
+ r4k_blast_dcache();
+}
+
static inline void local_r4k_flush_cache_range(void * args)
{
struct vm_area_struct *vma = args;
@@ -1281,6 +1291,10 @@ void __cpuinit r4k_cache_init(void)
PAGE_SIZE - 1);
else
shm_align_mask = PAGE_SIZE-1;
+
+ __flush_cache_vmap = r4k__flush_cache_vmap;
+ __flush_cache_vunmap = r4k__flush_cache_vunmap;
+
flush_cache_all = cache_noop;
__flush_cache_all = r4k___flush_cache_all;
flush_cache_mm = r4k_flush_cache_mm;