summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAnthony Yznaga <anthony.yznaga@oracle.com>2018-12-28 11:37:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 23:11:50 +0300
commitb6fb87b8e3ff1ef6bcf68470f24a97c984554d5a (patch)
treef4907a91dafc0fdb029a0a93341c5cb9cb14e5e3 /tools
parentbbe5d9939e81277bfbfb8fdba68374024b16d5fa (diff)
downloadlinux-b6fb87b8e3ff1ef6bcf68470f24a97c984554d5a.tar.xz
tools/vm/page-types.c: fix "kpagecount returned fewer pages than expected" failures
Because kpagecount_read() fakes success if map counts are not being collected, clamp the page count passed to it by walk_pfn() to the pages value returned by the preceding call to kpageflags_read(). Link: http://lkml.kernel.org/r/1543962269-26116-1-git-send-email-anthony.yznaga@oracle.com Fixes: 7f1d23e60718 ("tools/vm/page-types.c: include shared map counts") Signed-off-by: Anthony Yznaga <anthony.yznaga@oracle.com> Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Matthew Wilcox <willy@infradead.org> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/vm/page-types.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index 37908a83ddc2..1ff3a6c0367b 100644
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -701,7 +701,7 @@ static void walk_pfn(unsigned long voffset,
if (kpagecgroup_read(cgi, index, pages) != pages)
fatal("kpagecgroup returned fewer pages than expected");
- if (kpagecount_read(cnt, index, batch) != pages)
+ if (kpagecount_read(cnt, index, pages) != pages)
fatal("kpagecount returned fewer pages than expected");
for (i = 0; i < pages; i++)