[PATCH, resend 1/1] x86/kernel: re-use %*ph specifier

[PATCH, resend 1/1] x86/kernel: re-use %*ph specifier

[Andy Shevchenko]

%*ph specifier allows to dump data in hex format using the poiter to a buffer.
This is suitable to use here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/kernel/jump_label.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index e565e0e..8da5254 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -31,8 +31,8 @@ static void bug_at(unsigned char *ip, int line)
 	 * Something went wrong. Crash the box, as something could be
 	 * corrupting the kernel.
 	 */
-	pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
-	       ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
+	pr_warn("Unexpected op at %pS [%p] (%5ph) %s:%d\n",
+		ip, ip, ip, __FILE__, line);
 	BUG();
 }
 
-- 
2.5.1

Re: [PATCH, resend 1/1] x86/kernel: re-use %*ph specifier

[Thomas Gleixner]

On Fri, 2 Oct 2015, Andy Shevchenko wrote:

> %*ph specifier allows to dump data in hex format using the poiter to a buffer.
> This is suitable to use here.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  arch/x86/kernel/jump_label.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
> index e565e0e..8da5254 100644
> --- a/arch/x86/kernel/jump_label.c
> +++ b/arch/x86/kernel/jump_label.c
> @@ -31,8 +31,8 @@ static void bug_at(unsigned char *ip, int line)
>  	 * Something went wrong. Crash the box, as something could be
>  	 * corrupting the kernel.
>  	 */
> -	pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
> -	       ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
> +	pr_warn("Unexpected op at %pS [%p] (%5ph) %s:%d\n",
> +		ip, ip, ip, __FILE__, line);

We really do not need the file printed here. We better have the
message starting with "jumplabel: Unexpected ...." And it should not
be a warning as we BUG() right after that. pr_crit() is probably the
right choice, though I wonder whether we should panic() right away
when that happens.

>  	BUG();

Thanks,

	tglx