The patch titled
Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
has been removed from the -mm tree. Its filename was
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
This patch was dropped because it was folded into mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
fix SYSFS=n build
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix mm/ksm.c
--- a/mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
+++ a/mm/ksm.c
@@ -840,11 +840,6 @@ static int unmerge_ksm_pages(struct vm_a
return err;
}
-#ifdef CONFIG_SYSFS
-/*
- * Only called through the sysfs control interface:
- */
-
static inline struct stable_node *page_stable_node(struct page *page)
{
return PageKsm(page) ? page_rmapping(page) : NULL;
@@ -856,6 +851,10 @@ static inline void set_page_stable_node(
page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM);
}
+#ifdef CONFIG_SYSFS
+/*
+ * Only called through the sysfs control interface:
+ */
static int remove_stable_node(struct stable_node *stable_node)
{
struct page *page;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
revert-autofs-update-fs-autofs4-kconfig-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
