Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09729a99 authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Alexey Dobriyan
Browse files

proc: fix sparse warnings in pagemap_read() 



fs/proc/task_mmu.c:696:12: warning: cast removes address space of expression
fs/proc/task_mmu.c:696:9: warning: incorrect type in assignment (different address spaces)
fs/proc/task_mmu.c:696:9:    expected unsigned long long [noderef] [usertype] <asn:1>*out
fs/proc/task_mmu.c:696:9:    got unsigned long long [usertype] *<noident>
fs/proc/task_mmu.c:697:12: warning: cast removes address space of expression
fs/proc/task_mmu.c:697:9: warning: incorrect type in assignment (different address spaces)
fs/proc/task_mmu.c:697:9:    expected unsigned long long [noderef] [usertype] <asn:1>*end
fs/proc/task_mmu.c:697:9:    got unsigned long long [usertype] *<noident>
fs/proc/task_mmu.c:723:12: warning: cast removes address space of expression
fs/proc/task_mmu.c:723:26: error: subtraction of different types can't work (different address spaces)
fs/proc/task_mmu.c:725:24: error: subtraction of different types can't work (different address spaces)

Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
parent 1681bc30

fs/proc/task_mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -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--) {