diff options
author | Jérémy Lefaure <jeremy.lefaure@lse.epita.fr> | 2016-11-30 18:54:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-30 19:32:52 -0500 |
commit | e1465d125d2189e667029b9fa8a6f455180fbcf2 (patch) | |
tree | 84556b0ca42c9ec61792040f5f31ec4b9954b968 | |
parent | ded6e842cf499ef04b0d611d92b859d5b846c497 (diff) |
mm, thp: propagation of conditional compilation in khugepaged.c
Commit b46e756f5e47 ("thp: extract khugepaged from mm/huge_memory.c")
moved code from huge_memory.c to khugepaged.c. Some of this code should
be compiled only when CONFIG_SYSFS is enabled but the condition around
this code was not moved into khugepaged.c.
The result is a compilation error when CONFIG_SYSFS is disabled:
mm/built-in.o: In function `khugepaged_defrag_store': khugepaged.c:(.text+0x2d095): undefined reference to `single_hugepage_flag_store'
mm/built-in.o: In function `khugepaged_defrag_show': khugepaged.c:(.text+0x2d0ab): undefined reference to `single_hugepage_flag_show'
This commit adds the #ifdef CONFIG_SYSFS around the code related to
sysfs.
Link: http://lkml.kernel.org/r/20161114203448.24197-1-jeremy.lefaure@lse.epita.fr
Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/khugepaged.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 728d7790dc2d..87e1a7ca3846 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c | |||
@@ -103,6 +103,7 @@ static struct khugepaged_scan khugepaged_scan = { | |||
103 | .mm_head = LIST_HEAD_INIT(khugepaged_scan.mm_head), | 103 | .mm_head = LIST_HEAD_INIT(khugepaged_scan.mm_head), |
104 | }; | 104 | }; |
105 | 105 | ||
106 | #ifdef CONFIG_SYSFS | ||
106 | static ssize_t scan_sleep_millisecs_show(struct kobject *kobj, | 107 | static ssize_t scan_sleep_millisecs_show(struct kobject *kobj, |
107 | struct kobj_attribute *attr, | 108 | struct kobj_attribute *attr, |
108 | char *buf) | 109 | char *buf) |
@@ -295,6 +296,7 @@ struct attribute_group khugepaged_attr_group = { | |||
295 | .attrs = khugepaged_attr, | 296 | .attrs = khugepaged_attr, |
296 | .name = "khugepaged", | 297 | .name = "khugepaged", |
297 | }; | 298 | }; |
299 | #endif /* CONFIG_SYSFS */ | ||
298 | 300 | ||
299 | #define VM_NO_KHUGEPAGED (VM_SPECIAL | VM_HUGETLB) | 301 | #define VM_NO_KHUGEPAGED (VM_SPECIAL | VM_HUGETLB) |
300 | 302 | ||