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

[Randy Dunlap <rdunlap@infradead.org>]

On 05/10/2018 01:48 PM, Andrew Morton wrote:
> On Thu, 10 May 2018 09:37:51 -0700 Randy Dunlap <rdunlap@infradead.org> 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 <akpm@linux-foundation.org>
> Subject: mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix
> 
> fix SYSFS=n build
> 
> Cc: Andrea Arcangeli <aarcange@redhat.com>
> Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
> Cc: Randy Dunlap <rdunlap@infradead.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> 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
> 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;
> _


-- 
~Randy