aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/vmcore.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc/vmcore.c')
-rw-r--r--fs/proc/vmcore.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 4e61388ec03d..55bb57e6a30d 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -231,7 +231,9 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
231 231
232 list_for_each_entry(m, &vmcore_list, list) { 232 list_for_each_entry(m, &vmcore_list, list) {
233 if (*fpos < m->offset + m->size) { 233 if (*fpos < m->offset + m->size) {
234 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen); 234 tsz = (size_t)min_t(unsigned long long,
235 m->offset + m->size - *fpos,
236 buflen);
235 start = m->paddr + *fpos - m->offset; 237 start = m->paddr + *fpos - m->offset;
236 tmp = read_from_oldmem(buffer, tsz, &start, userbuf); 238 tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
237 if (tmp < 0) 239 if (tmp < 0)
@@ -461,7 +463,8 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)
461 if (start < m->offset + m->size) { 463 if (start < m->offset + m->size) {
462 u64 paddr = 0; 464 u64 paddr = 0;
463 465
464 tsz = min_t(size_t, m->offset + m->size - start, size); 466 tsz = (size_t)min_t(unsigned long long,
467 m->offset + m->size - start, size);
465 paddr = m->paddr + start - m->offset; 468 paddr = m->paddr + start - m->offset;
466 if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len, 469 if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len,
467 paddr >> PAGE_SHIFT, tsz, 470 paddr >> PAGE_SHIFT, tsz,