The patch titled Subject: khugepaged-add-self-test-fix-2-fix has been added to the -mm tree. Its filename is khugepaged-add-self-test-fix-2-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/khugepaged-add-self-test-fix-2-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/khugepaged-add-self-test-fix-2-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx> Subject: khugepaged-add-self-test-fix-2-fix fixup for issues I've noticed. Link: http://lkml.kernel.org/r/20200429124816.jp272trghrzxx5j5@box Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/vm/khugepaged.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/vm/khugepaged.c~khugepaged-add-self-test-fix-2-fix +++ a/tools/testing/selftests/vm/khugepaged.c @@ -342,7 +342,7 @@ static bool check_for_pattern(FILE *fp, return false; } -static bool check_huge(char *addr) +static bool check_huge(void *addr) { bool thp = false; int ret; @@ -350,7 +350,8 @@ static bool check_huge(char *addr) char buffer[MAX_LINE_LENGTH]; char addr_pattern[MAX_LINE_LENGTH]; - ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08llx-", addr); + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", + (unsigned long) addr); if (ret >= MAX_LINE_LENGTH) { printf("%s: Pattern is too long\n", __func__); exit(EXIT_FAILURE); @@ -365,7 +366,8 @@ static bool check_huge(char *addr) if (!check_for_pattern(fp, addr_pattern, buffer)) goto err_out; - ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "AnonHugePages:%10lld kB", hpage_pmd_size >> 10); + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "AnonHugePages:%10ld kB", + hpage_pmd_size >> 10); if (ret >= MAX_LINE_LENGTH) { printf("%s: Pattern is too long\n", __func__); exit(EXIT_FAILURE); @@ -395,7 +397,8 @@ static bool check_swap(void *addr, unsig char buffer[MAX_LINE_LENGTH]; char addr_pattern[MAX_LINE_LENGTH]; - ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08llx-", addr); + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", + (unsigned long) addr); if (ret >= MAX_LINE_LENGTH) { printf("%s: Pattern is too long\n", __func__); exit(EXIT_FAILURE); @@ -410,7 +413,8 @@ static bool check_swap(void *addr, unsig if (!check_for_pattern(fp, addr_pattern, buffer)) goto err_out; - ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "Swap:%19lld kB", size >> 10); + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "Swap:%19ld kB", + size >> 10); if (ret >= MAX_LINE_LENGTH) { printf("%s: Pattern is too long\n", __func__); exit(EXIT_FAILURE); _ Patches currently in -mm which might be from kirill@xxxxxxxxxxxxx are khugepaged-add-self-test-fix-2-fix.patch mm-filemap-fix-a-data-race-in-filemap_fault.patch