The patch titled
Subject: mm: fix dump_vma() compilation
has been removed from the -mm tree. Its filename was
introduce-dump_vma-fix-2.patch
This patch was dropped because it was folded into introduce-dump_vma.patch
------------------------------------------------------
From: Stephen Warren <swarren@xxxxxxxxxx>
Subject: mm: fix dump_vma() compilation
dump_vma() was written to access fields within vma->vm_page_prot. However,
pgprot_t is sometimes a scalar and sometimes a struct (At least on ARM;
see arch/arm/include/asm/pgtable-2level-types.h). use macro pgprot_val()
to get the value, so the code is immune to these differences.
This fixes:
mm/page_alloc.c: In function `dump_vma':
mm/page_alloc.c:6742:46: error: request for member `pgprot' in something not a structure or union
The cast is required to avoid:
mm/page_alloc.c: In function `dump_vma':
mm/page_alloc.c:6745:3: warning: format `%lx' expects argument of type `long unsigned int', but argument 8 has type `pgprot_t' [-Wformat]
Fixes: 658f7da49d34 ("mm: introduce dump_vma")
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/page_alloc.c~introduce-dump_vma-fix-2 mm/page_alloc.c
--- a/mm/page_alloc.c~introduce-dump_vma-fix-2
+++ a/mm/page_alloc.c
@@ -6734,7 +6734,8 @@ void dump_vma(const struct vm_area_struc
"prot %lx anon_vma %p vm_ops %p\n"
"pgoff %lx file %p private_data %p\n",
vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next,
- vma->vm_prev, vma->vm_mm, vma->vm_page_prot.pgprot,
+ vma->vm_prev, vma->vm_mm,
+ (unsigned long)pgprot_val(vma->vm_page_prot),
vma->anon_vma, vma->vm_ops, vma->vm_pgoff,
vma->vm_file, vma->vm_private_data);
dump_flags(vma->vm_flags, vmaflags_names, ARRAY_SIZE(vmaflags_names));
_
Patches currently in -mm which might be from swarren@xxxxxxxxxx are
origin.patch
introduce-dump_vma.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
