Thread (5 messages) 5 messages, 4 authors, 2018-05-11

Re: linux-next: Tree for May 10 (mm/ksm.c)

From: Mike Rapoprt <hidden>
Date: 2018-05-11 07:17:21
Also in: linux-mm, lkml


On May 11, 2018 1:03:04 AM GMT+03:00, Randy Dunlap [off-list ref] wrote:
On 05/10/2018 01:48 PM, Andrew Morton wrote:
quoted
On Thu, 10 May 2018 09:37:51 -0700 Randy Dunlap
[off-list ref] wrote:
quoted
quoted
On 05/10/2018 12:28 AM, Stephen Rothwell wrote:
quoted
Hi all,

Changes since 20180509:
on i386:

../mm/ksm.c: In function 'try_to_merge_one_page':
../mm/ksm.c:1244:4: error: implicit declaration of function
'set_page_stable_node' [-Werror=implicit-function-declaration]
quoted
quoted
    set_page_stable_node(page, NULL);
Oops, missed that, sorry.
quoted
Thanks.

From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix

fix SYSFS=n build

Cc: Andrea Arcangeli <redacted>
Cc: Mike Rapoport <redacted>
Cc: Randy Dunlap <redacted>
Acked-by: Randy Dunlap <redacted>
Reported-by: Randy Dunlap <redacted>
Tested-by: Randy Dunlap <redacted>
Acked-by: Mike Rapoport <redacted>
quoted
Cc: Stephen Rothwell <redacted>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/ksm.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff -puN
include/linux/ksm.h~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
include/linux/ksm.h
quoted
diff -puN mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
mm/ksm.c
quoted
--- a/mm/ksm.c~mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
+++ a/mm/ksm.c
@@ -823,11 +823,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)
quoted
 {
 	return PageKsm(page) ? page_rmapping(page) : NULL;
@@ -839,6 +834,10 @@ static inline void set_page_stable_node(
 	page->mapping = (void *)((unsigned long)stable_node |
PAGE_MAPPING_KSM);
quoted
 }
 
+#ifdef CONFIG_SYSFS
+/*
+ * Only called through the sysfs control interface:
+ */
 static int remove_stable_node(struct stable_node *stable_node)
 {
 	struct page *page;
_
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help