From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498AbeEJUs3 (ORCPT ); Thu, 10 May 2018 16:48:29 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33868 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbeEJUs0 (ORCPT ); Thu, 10 May 2018 16:48:26 -0400 Date: Thu, 10 May 2018 13:48:25 -0700 From: Andrew Morton To: Randy Dunlap Cc: Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List , Linux MM , Mike Rapoport Subject: Re: linux-next: Tree for May 10 (mm/ksm.c) Message-Id: <20180510134825.372f4a7ec17ce3e945640ac2@linux-foundation.org> In-Reply-To: References: <20180510172842.2619e058@canb.auug.org.au> X-Mailer: Sylpheed 3.6.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 10 May 2018 09:37:51 -0700 Randy Dunlap wrote: > On 05/10/2018 12:28 AM, Stephen Rothwell wrote: > > 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] > set_page_stable_node(page, NULL); Thanks. From: Andrew Morton Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix fix SYSFS=n build Cc: Andrea Arcangeli Cc: Mike Rapoport Cc: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- 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 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 @@ -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) { 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); } +#ifdef CONFIG_SYSFS +/* + * Only called through the sysfs control interface: + */ static int remove_stable_node(struct stable_node *stable_node) { struct page *page; _