diff options
| author |   Peter Xu <peterx@redhat.com> | 2023-04-12 12:41:20 -0400 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2023-04-18 16:30:02 -0700 |
| commit | af605d26a8f26e9e46fa82246dc1241efd3834a5 (patch) | |
| tree | 9be7bdf100728601f0b7bd4c681e8c130abb00a8 /tools/testing/selftests/mm/ksm_tests.c | |
| parent | selftests/mm: dump a summary in run_vmtests.sh (diff) | |
| download | wireguard-linux-af605d26a8f26e9e46fa82246dc1241efd3834a5.tar.xz wireguard-linux-af605d26a8f26e9e46fa82246dc1241efd3834a5.zip | |
selftests/mm: merge util.h into vm_util.h
There're two util headers under mm/ kselftest. Merge one with another.
It turns out util.h is the easy one to move.
When merging, drop PAGE_SIZE / PAGE_SHIFT because they're unnecessary
wrappers to page_size() / page_shift(), meanwhile rename them to psize()
and pshift() so as to not conflict with some existing definitions in some
test files that includes vm_util.h.
Link: https://lkml.kernel.org/r/20230412164120.327731-1-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Axel Rasmussen <axelrasmussen@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.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 f9eb4d67e0dd..74281593a124 100644 --- a/tools/testing/selftests/mm/ksm_tests.c +++ b/tools/testing/selftests/mm/ksm_tests.c @@ -12,7 +12,7 @@ #include "../kselftest.h" #include <include/vdso/time64.h> -#include "util.h" +#include "vm_util.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/" #define KSM_FP(s) (KSM_SYSFS_PATH s) |