From d0e16ccea469e5bceb4e19ab9661be160a7a0998 Mon Sep 17 00:00:00 2001 From: Milind Arun Choudhary Date: Fri, 20 Feb 2009 16:56:45 +0300 Subject: [PATCH] --- yaml --- r: 139015 b: refs/heads/master c: 09729a9919fdaf137995b0f19cbd401e22229cac h: refs/heads/master i: 139013: 20399b0957490e148f803048f05b92cb51611ac8 139011: a64134858e1c718278e4a85f7ae4cea4e2819fa5 139007: 588d1b5e3b7f7665278e8b0808a5485b440d2878 v: v3 --- [refs] | 2 +- trunk/fs/proc/task_mmu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 06d5858068f8..64955a0e0b75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1681bc30f272dd2fe347b90468791b05c7044f03 +refs/heads/master: 09729a9919fdaf137995b0f19cbd401e22229cac diff --git a/trunk/fs/proc/task_mmu.c b/trunk/fs/proc/task_mmu.c index 94063840832a..b0ae0be4801f 100644 --- a/trunk/fs/proc/task_mmu.c +++ b/trunk/fs/proc/task_mmu.c @@ -693,8 +693,8 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, goto out_pages; } - pm.out = (u64 *)buf; - pm.end = (u64 *)(buf + count); + pm.out = (u64 __user *)buf; + pm.end = (u64 __user *)(buf + count); pagemap_walk.pmd_entry = pagemap_pte_range; pagemap_walk.pte_hole = pagemap_pte_hole; @@ -720,9 +720,9 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, if (ret == PM_END_OF_BUFFER) ret = 0; /* don't need mmap_sem for these, but this looks cleaner */ - *ppos += (char *)pm.out - buf; + *ppos += (char __user *)pm.out - buf; if (!ret) - ret = (char *)pm.out - buf; + ret = (char __user *)pm.out - buf; out_pages: for (; pagecount; pagecount--) {