Patch "mm, thp: propagation of conditional compilation in khugepaged.c" has been added to the 4.8-stable tree

This is a note to let you know that I've just added the patch titled

mm, thp: propagation of conditional compilation in khugepaged.c

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mm-thp-propagation-of-conditional-compilation-in-khugepaged.c.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lefaure?= <[email protected]>
Date: Wed, 30 Nov 2016 15:54:02 -0800
Subject: mm, thp: propagation of conditional compilation in khugepaged.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Jérémy Lefaure <[email protected]>

commit e1465d125d2189e667029b9fa8a6f455180fbcf2 upstream.

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.

---
 mm/khugepaged.c |    2 ++
 1 file changed, 2 insertions(+)

@@ -103,6 +103,7 @@ static struct khugepaged_scan khugepaged
 	.mm_head = LIST_HEAD_INIT(khugepaged_scan.mm_head),
 };
 
+#ifdef CONFIG_SYSFS
 static ssize_t scan_sleep_millisecs_show(struct kobject *kobj,
 					 struct kobj_attribute *attr,
 					 char *buf)

@@ -295,6 +296,7 @@ struct attribute_group khugepaged_attr_g
 	.attrs = khugepaged_attr,
 	.name = "khugepaged",
 };
+#endif /* CONFIG_SYSFS */
 
 #define VM_NO_KHUGEPAGED (VM_SPECIAL | VM_HUGETLB)
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/mm-thp-propagation-of-conditional-compilation-in-khugepaged.c.patch