From patchwork Thu May 10 20:48:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 10392467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6266C60540 for ; Thu, 10 May 2018 20:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 510AB28CFA for ; Thu, 10 May 2018 20:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4592128D00; Thu, 10 May 2018 20:48:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6846128CFA for ; Thu, 10 May 2018 20:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DCF26B0620; Thu, 10 May 2018 16:48:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 48C086B0644; Thu, 10 May 2018 16:48:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 330F76B0645; Thu, 10 May 2018 16:48:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id E60136B0620 for ; Thu, 10 May 2018 16:48:27 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id bd7-v6so1808304plb.20 for ; Thu, 10 May 2018 13:48:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PJFWXiDZr7z1hHDa7IFAyxrLecXwOsgOjsc1tCuMAk4=; b=NXNlMRpAzGRCs7jQ2buTpephu7e8U9Z2ffhLsZ+A1VPV9WDm5eaRBRdLWLXLw4OiAO rp8Ui3joGi0RtI+YJ709LOnj5f80MuaSiUwFpd0yEK2WJMXlHnrPXKmDNzyoI0iEx1eD uYt5c8jQMp7eiHaFJPwQnY9MQX9B8qMwbnGrBveMRX2CH+WBVg8EKlIjzN2T6ufdL2pw y+oQiAtXJbVYzwoXYXL49dSB8mIYSZpy0Tif1tfDcpGCQSx1T/07HfWeRFjag8cKW3oq A9Wb2oaRIrT+/Q3ACHrYBka2oqf3arWGYDH4ULYj6dfVmMwoCz1onI00X10A+qA+9GaP dSnQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Gm-Message-State: ALKqPwf+U7NT5wpkFfcYvGnYq8W0YHx8Ht/v2fl64AVQZ/IaLvWekzQt 0qmLHDyFjVsXmZZ9LPROoNx6NaCXC61qod552pKBD92RYO5ImZ+yHUXHclU9YfqqpkUEBoSry8q Ts2am7+umbafkPEKA8EmF8xKlPQXZGl8QmdgWiQBj9CaOcLL+dtbg9gVHBYrRZx7BRQ== X-Received: by 2002:a17:902:b908:: with SMTP id bf8-v6mr2704842plb.358.1525985307568; Thu, 10 May 2018 13:48:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqK9DXko5/DWK4bE5W6Nj/9b3BrfK7Llpm0ZQ2B397ABS6qEY5gMF7DH9O751MCAs4ElHhU X-Received: by 2002:a17:902:b908:: with SMTP id bf8-v6mr2704794plb.358.1525985306465; Thu, 10 May 2018 13:48:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525985306; cv=none; d=google.com; s=arc-20160816; b=CNuUTsa3Coh+h7C2rAKrU9KEw4SgXWujQHKvBmoHYNyoL/7J7O9FtFO8ChPPqC/F7S uH9fwhkx6ftkAwMcDYcqGjsLdV4XyTzUxxeaUenKLhQQ3XjPQ+A0oBhX4biK8/sN10/H 0A+2qkH4cOfyzjn4v5Nf2XIIBtiCZKWJEm41t9uipZBMok1ieTY9RjzpwulI2jZS2cjG l9fBwChK6LsTDvU8HObKPoVfKGHrczSxlK54B19nyWXne2bLWFQn+sUTRhU9vv2YDkOh 2hyqaalfFuVjL0rcTLVBG6hnHCTJQPcNjNnc5+7g6kczg5J2M2ryTnA59eLhhMjLhHtw yaoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=PJFWXiDZr7z1hHDa7IFAyxrLecXwOsgOjsc1tCuMAk4=; b=cy+LZvvspNQ7d/hKBek9FQinWY7Igz2Ule+Y++3Ppf9PB2VT/eSwCerpPTdGTHRDp3 km6UiJDYrT34hp3f+L3MEcrROlRAlJdF6Nb9f84zd4VAJjiyJ/0NoVfIKRHafHg1KUnJ m8+kbaLrShJDdC1nDkPTAbulWtjbeYRvvJrZlg4nDKn8Z9KhFUmt6j0sLgAT7jIE0eHo m6/4ISFqTawVWPoL3qvhbo9q1TJ1S119O9Vh72onxOhrMXDm42C5vLDRFwfEbK6folw5 NmOxO0XiR9/UVz2udUqZi1pgswmo781GH0clsqZ0pCqwerhtsjyxerlvEowfatIYcQTD taYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id c6-v6si1567325plo.88.2018.05.10.13.48.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 13:48:26 -0700 (PDT) Received-SPF: pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org Received: from akpm3.svl.corp.google.com (unknown [104.133.9.71]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id EFF229F0; Thu, 10 May 2018 20:48:25 +0000 (UTC) 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Randy Dunlap Reported-by: Randy Dunlap Tested-by: Randy Dunlap Acked-by: Mike Rapoport --- 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;