[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-c80c5ec1b2fa8d3675fc2a6807a64771ea156698@git.kernel.org>
Date: Sun, 11 Feb 2018 04:11:15 -0800
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...e.de, sergey.senozhatsky.work@...il.com,
peterz@...radead.org, torvalds@...ux-foundation.org,
tglx@...utronix.de, linux-kernel@...r.kernel.org,
tony.luck@...el.com, mingo@...nel.org, hpa@...or.com
Subject: [tip:x86/urgent] x86/MCE: Fix build warning introduced by "x86: do
not use print_symbol()"
Commit-ID: c80c5ec1b2fa8d3675fc2a6807a64771ea156698
Gitweb: https://git.kernel.org/tip/c80c5ec1b2fa8d3675fc2a6807a64771ea156698
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Sat, 10 Feb 2018 15:53:14 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Sun, 11 Feb 2018 11:37:39 +0100
x86/MCE: Fix build warning introduced by "x86: do not use print_symbol()"
The following commit:
7b6061627eb8 ("x86: do not use print_symbol()")
... introduced a new build warning on 32-bit x86:
arch/x86/kernel/cpu/mcheck/mce.c:237:21: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
pr_cont("{%pS}", (void *)m->ip);
^
Fix the type mismatch between the 'void *' expected by %pS and the mce->ip
field which is u64 by casting to long.
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tony Luck <tony.luck@...el.com>
Cc: linux-kernel@...r.kernel.org
Fixes: 7b6061627eb8 ("x86: do not use print_symbol()")
Link: http://lkml.kernel.org/r/20180210145314.22174-1-bp@alien8.de
[ Cleaned up the changelog. ]
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 3a8e88a..75f405a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -234,7 +234,7 @@ static void __print_mce(struct mce *m)
m->cs, m->ip);
if (m->cs == __KERNEL_CS)
- pr_cont("{%pS}", (void *)m->ip);
+ pr_cont("{%pS}", (void *)(unsigned long)m->ip);
pr_cont("\n");
}
Powered by blists - more mailing lists