Skip to content

Commit 22f3c95

Browse files
sunnanyongtorvalds
authored andcommitted
khugepaged: selftests: remove debug_cow
The debug_cow attribute had been removed since commit 4958e4d ("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: 4958e4d ("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>
1 parent a6a8f7c commit 22f3c95

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

tools/testing/selftests/vm/khugepaged.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ struct settings {
8686
enum thp_enabled thp_enabled;
8787
enum thp_defrag thp_defrag;
8888
enum shmem_enabled shmem_enabled;
89-
bool debug_cow;
9089
bool use_zero_page;
9190
struct khugepaged_settings khugepaged;
9291
};
@@ -95,7 +94,6 @@ static struct settings default_settings = {
9594
.thp_enabled = THP_MADVISE,
9695
.thp_defrag = THP_DEFRAG_ALWAYS,
9796
.shmem_enabled = SHMEM_NEVER,
98-
.debug_cow = 0,
9997
.use_zero_page = 0,
10098
.khugepaged = {
10199
.defrag = 1,
@@ -268,7 +266,6 @@ static void write_settings(struct settings *settings)
268266
write_string("defrag", thp_defrag_strings[settings->thp_defrag]);
269267
write_string("shmem_enabled",
270268
shmem_enabled_strings[settings->shmem_enabled]);
271-
write_num("debug_cow", settings->debug_cow);
272269
write_num("use_zero_page", settings->use_zero_page);
273270

274271
write_num("khugepaged/defrag", khugepaged->defrag);
@@ -304,7 +301,6 @@ static void save_settings(void)
304301
.thp_defrag = read_string("defrag", thp_defrag_strings),
305302
.shmem_enabled =
306303
read_string("shmem_enabled", shmem_enabled_strings),
307-
.debug_cow = read_num("debug_cow"),
308304
.use_zero_page = read_num("use_zero_page"),
309305
};
310306
saved_settings.khugepaged = (struct khugepaged_settings) {

0 commit comments

Comments
 (0)