diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-02-21 09:57:35 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-02-21 09:57:35 +0300 |
| commit | 40de53fd002c6ba087a623722915e8006ed68a02 (patch) | |
| tree | ec733b0a05924f98855728cd24de2ea38e1223b8 /tools/testing/selftests/mm/ksm_tests.c | |
| parent | 0cab687205986491302cd2e440ef1d253031c221 (diff) | |
| parent | f3e6b3ae9cfc128af11b665c6ef4022ba2683778 (diff) | |
| download | linux-40de53fd002c6ba087a623722915e8006ed68a02.tar.xz | |
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
Pick up CXL CPER notification removal for v6.8-rc6, to return in a later
merge window.
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); |