Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[deliverable/linux.git] / fs / proc / vmcore.c

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 4e61388ec03d2af3a426bb788f2382f4f27db1aa..55bb57e6a30d3f3bae7b6db04b1f827e2885eff4 100644 (file)
--- 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,
 
        list_for_each_entry(m, &vmcore_list, list) {
                if (*fpos < m->offset + m->size) {
-                       tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
+                       tsz = (size_t)min_t(unsigned long long,
+                                           m->offset + m->size - *fpos,
+                                           buflen);
                        start = m->paddr + *fpos - m->offset;
                        tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
                        if (tmp < 0)
@@ -461,7 +463,8 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)
                if (start < m->offset + m->size) {
                        u64 paddr = 0;
 
-                       tsz = min_t(size_t, m->offset + m->size - start, size);
+                       tsz = (size_t)min_t(unsigned long long,
+                                           m->offset + m->size - start, size);
                        paddr = m->paddr + start - m->offset;
                        if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len,
                                                    paddr >> PAGE_SHIFT, tsz,