diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-04 06:21:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-04 06:21:02 -0800 |
| commit | a802f50d6e92298d44a806d326a2ba3eefa6db72 (patch) | |
| tree | 40cafff98f5248d0121656fc538e65dc9baa64b2 /tools/testing/selftests/mm/ksm_tests.c | |
| parent | fccc9d9233f918ee50cf2955ae7134a7f3418351 (diff) | |
| parent | 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 (diff) | |
Merge 6.8-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/mm/ksm_tests.c')
| -rw-r--r-- | tools/testing/selftests/mm/ksm_tests.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c index 380b691d3eb9..b748c48908d9 100644 --- a/tools/testing/selftests/mm/ksm_tests.c +++ b/tools/testing/selftests/mm/ksm_tests.c @@ -566,7 +566,7 @@ static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot, if (map_ptr_orig == MAP_FAILED) err(2, "initial mmap"); - if (madvise(map_ptr, len + HPAGE_SIZE, MADV_HUGEPAGE)) + if (madvise(map_ptr, len, MADV_HUGEPAGE)) err(2, "MADV_HUGEPAGE"); pagemap_fd = open("/proc/self/pagemap", O_RDONLY); |