summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-08 15:06:39 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-08 15:06:39 -0800
commit74bda9310fe9776f3d940057ac2e7881214577d6 (patch)
tree38989eda1ce69bcf580a6b82c977d0862497151c /mm
parentfea5f1e19611d94fbf3905875a427c4cb959cd06 (diff)
parente97126cd9056b3b42cdc862ace2ed66f8026f55b (diff)
downloadlinux-stable-74bda9310fe9776f3d940057ac2e7881214577d6.tar.gz
linux-stable-74bda9310fe9776f3d940057ac2e7881214577d6.tar.bz2
linux-stable-74bda9310fe9776f3d940057ac2e7881214577d6.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Provide basic printk_clock() implementation [ARM] Resolve fuse and direct-IO failures due to missing cache flushes [ARM] pass vma for flush_anon_page() [ARM] Fix potential MMCI bug [ARM] Fix kernel-mode undefined instruction aborts [ARM] 4082/1: iop3xx: fix iop33x gpio register offset [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes [ARM] 4079/1: iop: Update MAINTAINERS
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 563792f4f687..af227d26e104 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1091,7 +1091,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
if (pages) {
pages[i] = page;
- flush_anon_page(page, start);
+ flush_anon_page(vma, page, start);
flush_dcache_page(page);
}
if (vmas)