diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-08 18:06:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-08 18:06:39 -0500 |
| commit | 74bda9310fe9776f3d940057ac2e7881214577d6 (patch) | |
| tree | 38989eda1ce69bcf580a6b82c977d0862497151c /mm | |
| parent | fea5f1e19611d94fbf3905875a427c4cb959cd06 (diff) | |
| parent | e97126cd9056b3b42cdc862ace2ed66f8026f55b (diff) | |
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.c | 2 |
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, | |||
| 1091 | if (pages) { | 1091 | if (pages) { |
| 1092 | pages[i] = page; | 1092 | pages[i] = page; |
| 1093 | 1093 | ||
| 1094 | flush_anon_page(page, start); | 1094 | flush_anon_page(vma, page, start); |
| 1095 | flush_dcache_page(page); | 1095 | flush_dcache_page(page); |
| 1096 | } | 1096 | } |
| 1097 | if (vmas) | 1097 | if (vmas) |