Skip to content

Commit

Permalink
khugepaged: selftests: remove debug_cow
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nanyong Sun authored and Linus Torvalds committed Jul 1, 2021
1 parent a6a8f7c commit 22f3c95
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions tools/testing/selftests/vm/khugepaged.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand All @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 22f3c95

Please sign in to comment.