From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871AbeAZCq5 (ORCPT ); Thu, 25 Jan 2018 21:46:57 -0500 Received: from out02.mta.xmission.com ([166.70.13.232]:43179 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbeAZCqz (ORCPT ); Thu, 25 Jan 2018 21:46:55 -0500 From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Ram Pai References: <20180126120512.1b431ac7@canb.auug.org.au> Date: Thu, 25 Jan 2018 20:45:53 -0600 In-Reply-To: <20180126120512.1b431ac7@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 26 Jan 2018 12:05:12 +1100") Message-ID: <87fu6ttk0u.fsf@xmission.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1eeu2X-0002HT-Ka;;;mid=<87fu6ttk0u.fsf@xmission.com>;;;hst=in01.mta.xmission.com;;;ip=97.121.88.104;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1/vAd+3H2vY+RORDUopBsPX+ejX1xz7bss= X-SA-Exim-Connect-IP: 97.121.88.104 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.0 T_TM2_M_HEADER_IN_MSG BODY: No description available. * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Stephen Rothwell X-Spam-Relay-Country: X-Spam-Timing: total 226 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 3.0 (1.3%), b_tie_ro: 1.99 (0.9%), parse: 1.01 (0.4%), extract_message_metadata: 14 (6.1%), get_uri_detail_list: 1.98 (0.9%), tests_pri_-1000: 6 (2.8%), tests_pri_-950: 1.11 (0.5%), tests_pri_-900: 0.94 (0.4%), tests_pri_-400: 19 (8.5%), check_bayes: 18 (8.1%), b_tokenize: 6 (2.7%), b_tok_get_all: 6 (2.6%), b_comp_prob: 1.81 (0.8%), b_tok_touch_all: 2.8 (1.2%), b_finish: 0.63 (0.3%), tests_pri_0: 173 (76.2%), check_dkim_signature: 0.45 (0.2%), check_dkim_adsp: 2.4 (1.1%), tests_pri_500: 6 (2.5%), poll_dns_idle: 0.24 (0.1%), rewrite_mail: 0.00 (0.0%) Subject: Re: linux-next: build failure after merge of the userns tree X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi Eric, > > After merging the userns tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > arch/powerpc/kernel/mce.c: In function 'machine_process_ue_event': > arch/powerpc/kernel/mce.c:276:5: error: too many arguments to function 'memory_failure' > memory_failure(pfn, SIGBUS, 0); > ^~~~~~~~~~~~~~ > In file included from include/linux/pid_namespace.h:7:0, > from include/linux/ptrace.h:10, > from arch/powerpc/kernel/mce.c:27: > include/linux/mm.h:2571:12: note: declared here > extern int memory_failure(unsigned long pfn, int flags); > ^~~~~~~~~~~~~~ > > Caused by commit > > 83b57531c58f ("mm/memory_failure: Remove unused trapno from memory_failure") > > I have added the following patch for today: Acked-by: "Eric W. Biederman" The patch below is correct, and it really makes me appreciate my removal of unused trapno parameter. Thank you for catching that. Eric > From: Stephen Rothwell > Date: Fri, 26 Jan 2018 11:54:39 +1100 > Subject: [PATCH] mm/memory_failure: update powerpc for memory_failure() API change > > Signed-off-by: Stephen Rothwell > --- > arch/powerpc/kernel/mce.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c > index d2fecaec4fec..efdd16a79075 100644 > --- a/arch/powerpc/kernel/mce.c > +++ b/arch/powerpc/kernel/mce.c > @@ -273,7 +273,7 @@ static void machine_process_ue_event(struct work_struct *work) > > pfn = evt->u.ue_error.physical_address >> > PAGE_SHIFT; > - memory_failure(pfn, SIGBUS, 0); > + memory_failure(pfn, 0); > } else > pr_warn("Failed to identify bad address from " > "where the uncorrectable error (UE) " > -- > 2.15.1