From: Stephen Warren <[email protected]> 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] Cc: Sasha Levin <[email protected]> Cc: Naoya Horiguchi <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Konstantin Khlebnikov <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Michel Lespinasse <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Andrew Morton <[email protected]> Fixes: 658f7da49d34 ("mm: introduce dump_vma") Signed-off-by: Stephen Warren <[email protected]> --- mm/page_alloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cb510c08073b..1578bc98eb29 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6739,7 +6739,8 @@ void dump_vma(const struct vm_area_struct *vma) "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)); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
