The patch titled
Subject: mmap_vmcore: skip non-ram pages reported by hypervisors
has been removed from the -mm tree. Its filename was
mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors-v6.patch
This patch was dropped because it was folded into mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors.patch
------------------------------------------------------
From: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Subject: mmap_vmcore: skip non-ram pages reported by hypervisors
Changes from v5:
- make len size_t to match do_unmap() interface
Changes from v4:
- change map_size type size_t -> unsigned long
- use prot instead of vma->vm_page_prot inside remap_oldmem_pfn_checked()
Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Reviewed-by: Andrew Jones <drjones@xxxxxxxxxx>
Cc: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: David Vrabel <david.vrabel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/vmcore.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/proc/vmcore.c~mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors-v6 fs/proc/vmcore.c
--- a/fs/proc/vmcore.c~mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors-v6
+++ a/fs/proc/vmcore.c
@@ -344,10 +344,10 @@ static int remap_oldmem_pfn_checked(stru
unsigned long from, unsigned long pfn,
unsigned long size, pgprot_t prot)
{
- size_t map_size;
+ unsigned long map_size;
unsigned long pos_start, pos_end, pos;
unsigned long zeropage_pfn = my_zero_pfn(0);
- u64 len = 0;
+ size_t len = 0;
pos_start = pfn;
pos_end = pfn + (size >> PAGE_SHIFT);
@@ -381,7 +381,7 @@ static int remap_oldmem_pfn_checked(stru
/* Remap the rest */
map_size = (pos - pos_start) << PAGE_SHIFT;
if (remap_oldmem_pfn_range(vma, from + len, pos_start,
- map_size, vma->vm_page_prot))
+ map_size, prot))
goto fail;
len += map_size;
}
_
Patches currently in -mm which might be from vkuznets@xxxxxxxxxx are
mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors.patch
mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors-v7.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
