From: Qian Cai <cai@lca.pw>
To: mingo@redhat.com, tglx@linutronix.de, bp@alien8.de
Cc: dave.hansen@linux.intel.com, luto@kernel.org,
peterz@infradead.org, hpa@zytor.com, x86@kernel.org,
linux-kernel@vger.kernel.org, Qian Cai <cai@lca.pw>
Subject: [PATCH -next] x86/mm: fix an unused variable "tsk" warning
Date: Fri, 31 May 2019 17:37:21 -0400 [thread overview]
Message-ID: <1559338641-6145-1-git-send-email-cai@lca.pw> (raw)
Since the commit "signal: Remove the task parameter from
force_sig_fault", "tsk" is only used when MEMORY_FAILURE=y and generates
a compilation warning without it.
arch/x86/mm/fault.c: In function 'do_sigbus':
arch/x86/mm/fault.c:1017:22: warning: unused variable 'tsk'
[-Wunused-variable]
Also, change to use IS_ENABLED() instead.
Signed-off-by: Qian Cai <cai@lca.pw>
---
arch/x86/mm/fault.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 46ac96aa7c81..40d70bd3fa84 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1014,8 +1014,6 @@ static inline bool bad_area_access_from_pkeys(unsigned long error_code,
do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
vm_fault_t fault)
{
- struct task_struct *tsk = current;
-
/* Kernel mode? Handle exceptions or die: */
if (!(error_code & X86_PF_USER)) {
no_context(regs, error_code, address, SIGBUS, BUS_ADRERR);
@@ -1028,9 +1026,10 @@ static inline bool bad_area_access_from_pkeys(unsigned long error_code,
set_signal_archinfo(address, error_code);
-#ifdef CONFIG_MEMORY_FAILURE
- if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
+ if (IS_ENABLED(CONFIG_MEMORY_FAILURE) &&
+ (fault & (VM_FAULT_HWPOISON | VM_FAULT_HWPOISON_LARGE))) {
unsigned lsb = 0;
+ struct task_struct *tsk = current;
pr_err(
"MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
@@ -1042,7 +1041,6 @@ static inline bool bad_area_access_from_pkeys(unsigned long error_code,
force_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb);
return;
}
-#endif
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
}
--
1.8.3.1
next reply other threads:[~2019-05-31 21:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 21:37 Qian Cai [this message]
2019-06-12 17:55 ` Borislav Petkov
2019-06-12 18:19 ` Eric W. Biederman
2019-06-12 19:53 ` Borislav Petkov
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=1559338641-6145-1-git-send-email-cai@lca.pw \
--to=cai@lca.pw \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®