]> git.baikalelectronics.ru Git - kernel.git/commitdiff
khugepaged: selftests: remove debug_cow
authorNanyong Sun <sunnanyong@huawei.com>
Thu, 1 Jul 2021 01:48:16 +0000 (18:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2021 03:47:26 +0000 (20:47 -0700)
The debug_cow attribute had been removed since commit 1217dc16cb9221 ("mm:
thp: remove debug_cow switch"), so remove it in selftest code too,
otherwise the khugepaged test will fail.

Link: https://lkml.kernel.org/r/20210430051117.400189-1-sunnanyong@huawei.com
Fixes: 1217dc16cb9221 ("mm: thp: remove debug_cow switch")
Signed-off-by: Nanyong Sun <sunnanyong@huawei.com>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
tools/testing/selftests/vm/khugepaged.c

index 8b75821302a79dcb0ea04c564d6d7f6428791f9c..155120b67a165d8497e9ca73b41bc819f18bd3e8 100644 (file)
@@ -86,7 +86,6 @@ struct settings {
        enum thp_enabled thp_enabled;
        enum thp_defrag thp_defrag;
        enum shmem_enabled shmem_enabled;
-       bool debug_cow;
        bool use_zero_page;
        struct khugepaged_settings khugepaged;
 };
@@ -95,7 +94,6 @@ static struct settings default_settings = {
        .thp_enabled = THP_MADVISE,
        .thp_defrag = THP_DEFRAG_ALWAYS,
        .shmem_enabled = SHMEM_NEVER,
-       .debug_cow = 0,
        .use_zero_page = 0,
        .khugepaged = {
                .defrag = 1,
@@ -268,7 +266,6 @@ static void write_settings(struct settings *settings)
        write_string("defrag", thp_defrag_strings[settings->thp_defrag]);
        write_string("shmem_enabled",
                        shmem_enabled_strings[settings->shmem_enabled]);
-       write_num("debug_cow", settings->debug_cow);
        write_num("use_zero_page", settings->use_zero_page);
 
        write_num("khugepaged/defrag", khugepaged->defrag);
@@ -304,7 +301,6 @@ static void save_settings(void)
                .thp_defrag = read_string("defrag", thp_defrag_strings),
                .shmem_enabled =
                        read_string("shmem_enabled", shmem_enabled_strings),
-               .debug_cow = read_num("debug_cow"),
                .use_zero_page = read_num("use_zero_page"),
        };
        saved_settings.khugepaged = (struct khugepaged_settings) {