Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

selftests/vm: ksm_functional_tests: fixes for 32bit

Browse Source 
The test currently fails on 32bit.  Fixing the "-1ull" vs.  "-1ul" seems
to make the test pass and the compiler happy.

Note: This test is not in mm-stable yet. This fix should be squashed into
      "selftests/vm: add KSM unmerge tests".

Link: https://lkml.kernel.org/r/20221205193716.276024-5-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
David Hildenbrand 2022-12-05 20:37:16 +01:00 committed by Andrew Morton
parent 380969fe5a
commit 9d789c3b41
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/vm/ksm_functional_tests.c
View File

@ -42,13 +42,13 @@ static bool range_maps_duplicates(char *addr, unsigned long size)
for (offs_a = 0; offs_a < size; offs_a += pagesize) {
pfn_a = pagemap_get_pfn(pagemap_fd, addr + offs_a);
/* Page not present or PFN not exposed by the kernel. */
if (pfn_a == -1ull || !pfn_a)
if (pfn_a == -1ul || !pfn_a)
continue;
for (offs_b = offs_a + pagesize; offs_b < size;
offs_b += pagesize) {
pfn_b = pagemap_get_pfn(pagemap_fd, addr + offs_b);
if (pfn_b == -1ull || !pfn_b)
if (pfn_b == -1ul || !pfn_b)
continue;
if (pfn_a == pfn_b)
return true;

2
tools/testing/selftests/vm/vm_util.c
View File

@ -50,7 +50,7 @@ unsigned long pagemap_get_pfn(int fd, char *start)
/* If present (63th bit), PFN is at bit 0 -- 54. */
if (entry & 0x8000000000000000ull)
return entry & 0x007fffffffffffffull;
return -1ull;
return -1ul;
}
void clear_softdirty(void)