From: ebiederm@xmission.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-arch@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>,
Oleg Nesterov <oleg@redhat.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [GIT PULL] siginfo fix for 4.16-rc1
Date: Wed, 31 Jan 2018 10:19:01 -0600 [thread overview]
Message-ID: <87607im26i.fsf_-_@xmission.com> (raw)
In-Reply-To: <87a7wwnkce.fsf@xmission.com> (Eric W. Biederman's message of "Mon, 29 Jan 2018 20:36:49 -0600")
Linus,
Please pull the siginfo-linus branch from the git tree:
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git siginfo-linus
HEAD: f20239c0d2d720d7deb8a40fd05c31849ddc8293 mm/memory_failure: update powerpc for memory_failure() API change
I had a brain fart when I received Stephen email about a compile failure
in linux-next. I thought the powerpc call to memory_failure had not
merged yet. Instead it simply failed to compile :(
Linus can you please pull Stephen's fix so that powerpc builds correctly.
Thank you,
Eric
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Jan 2018 12:05:12 +1100
Subject: [PATCH] mm/memory_failure: update powerpc for memory_failure() API change
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")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
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 742e4658c5dc..71e8a1b8c86e 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.14.1
next prev parent reply other threads:[~2018-01-31 16:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 20:02 [GIT PULL] siginfo cleanups for 4.16-rc1 Eric W. Biederman
2018-01-30 2:36 ` Eric W. Biederman
2018-01-31 16:19 ` Eric W. Biederman [this message]
2018-01-31 19:30 ` [GIT PULL] siginfo fix " Linus Torvalds
2018-01-31 19:57 ` Eric W. Biederman
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=87607im26i.fsf_-_@xmission.com \
--to=ebiederm@xmission.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox