LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Mike Rapoprt <rppt@linux.vnet.ibm.com>
To: Randy Dunlap <rdunlap@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux MM <linux-mm@kvack.org>
Subject: Re: linux-next: Tree for May 10 (mm/ksm.c)
Date: Fri, 11 May 2018 10:17:05 +0300	[thread overview]
Message-ID: <5574BF43-F2BB-4A19-BCCE-37F402DCED06@linux.vnet.ibm.com> (raw)
In-Reply-To: <91e95111-eb0c-205b-722b-18016da93c04@infradead.org>



On May 11, 2018 1:03:04 AM GMT+03:00, Randy Dunlap <rdunlap@infradead.org> wrote:
>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);

Oops, missed that, sorry.

>> 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>

Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>

>> 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;
>> _

      reply	other threads:[~2018-05-11  7:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-10  7:28 linux-next: Tree for May 10 Stephen Rothwell
2018-05-10 16:37 ` linux-next: Tree for May 10 (mm/ksm.c) Randy Dunlap
2018-05-10 20:48   ` Andrew Morton
2018-05-10 22:03     ` Randy Dunlap
2018-05-11  7:17       ` Mike Rapoprt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5574BF43-F2BB-4A19-BCCE-37F402DCED06@linux.vnet.ibm.com \
    --to=rppt@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: Tree for May 10 (mm/ksm.c)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).