Subject: [folded-merged] vmcore-introduce-remap_oldmem_pfn_range-fix.patch removed from -mm tree To: holzheu@xxxxxxxxxxxxxxxxxx,d.hatayama@xxxxxxxxxxxxxx,fengguang.wu@xxxxxxxxx,vgoyal@xxxxxxxxxx,willeke@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 11 Sep 2013 14:04:09 -0700 The patch titled Subject: vmcore: fix address space sparse warnings has been removed from the -mm tree. Its filename was vmcore-introduce-remap_oldmem_pfn_range-fix.patch This patch was dropped because it was folded into vmcore-introduce-remap_oldmem_pfn_range.patch ------------------------------------------------------ From: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> Subject: vmcore: fix address space sparse warnings Fix the following sparse warnings: fs/proc/vmcore.c:173:34: sparse: incorrect type in argument 1 (different address spaces) fs/proc/vmcore.c:173:34: expected void [noderef] <asn:1>*dst fs/proc/vmcore.c:173:34: got void *target fs/proc/vmcore.c:256:30: sparse: incorrect type in argument 1 (different address spaces) fs/proc/vmcore.c:256:30: expected char *[assigned] buffer fs/proc/vmcore.c:256:30: got char [noderef] <asn:1>*buffer Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> Cc: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: HATAYAMA Daisuke <d.hatayama@xxxxxxxxxxxxxx> Cc: Jan Willeke <willeke@xxxxxxxxxx> Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/vmcore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN fs/proc/vmcore.c~vmcore-introduce-remap_oldmem_pfn_range-fix fs/proc/vmcore.c --- a/fs/proc/vmcore.c~vmcore-introduce-remap_oldmem_pfn_range-fix +++ a/fs/proc/vmcore.c @@ -170,7 +170,7 @@ int __weak remap_oldmem_pfn_range(struct static int copy_to(void *target, void *src, size_t size, int userbuf) { if (userbuf) { - if (copy_to_user(target, src, size)) + if (copy_to_user((char __user *) target, src, size)) return -EFAULT; } else { memcpy(target, src, size); @@ -253,7 +253,7 @@ static ssize_t __read_vmcore(char *buffe static ssize_t read_vmcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) { - return __read_vmcore(buffer, buflen, fpos, 1); + return __read_vmcore((__force char *) buffer, buflen, fpos, 1); } /* _ Patches currently in -mm which might be from holzheu@xxxxxxxxxxxxxxxxxx are vmcore-introduce-elf-header-in-new-memory-feature.patch s390-vmcore-use-elf-header-in-new-memory-feature.patch vmcore-introduce-remap_oldmem_pfn_range.patch s390-vmcore-implement-remap_oldmem_pfn_range-for-s390.patch vmcore-enable-proc-vmcore-mmap-for-s390.patch s390-vmcore-use-vmcore-for-zfcpdump.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html