From: Joe Perches <joe@perches.com>
To: Jiri Kosina <trivial@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
linux390@de.ibm.com, linux-s390@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [TRIVIAL PATCH V2 12/26] s390: Convert print_symbol to %pSR
Date: Wed, 12 Dec 2012 17:43:49 -0800 [thread overview]
Message-ID: <1355363029.2164.14.camel@joe-AO722> (raw)
In-Reply-To: <cover.1355335227.git.joe@perches.com>
Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: Joe Perches <joe@perches.com>
---
V2: Add missing parentheses, remove comma
arch/s390/kernel/traps.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 70ecfc5..f718e12 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -91,8 +91,9 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
if (sp < low || sp > high - sizeof(*sf))
return sp;
sf = (struct stack_frame *) sp;
- printk("([<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
- print_symbol("%s)\n", sf->gprs[8] & PSW_ADDR_INSN);
+ printk("([<%016lx>] %pSR)\n",
+ sf->gprs[8] & PSW_ADDR_INSN,
+ (void *)(sf->gprs[8] & PSW_ADDR_INSN));
/* Follow the backchain. */
while (1) {
low = sp;
@@ -102,16 +103,18 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
if (sp <= low || sp > high - sizeof(*sf))
return sp;
sf = (struct stack_frame *) sp;
- printk(" [<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
- print_symbol("%s\n", sf->gprs[8] & PSW_ADDR_INSN);
+ printk(" [<%016lx>] %pSR\n",
+ sf->gprs[8] & PSW_ADDR_INSN,
+ (void *)(sf->gprs[8] & PSW_ADDR_INSN));
}
/* Zero backchain detected, check for interrupt frame. */
sp = (unsigned long) (sf + 1);
if (sp <= low || sp > high - sizeof(*regs))
return sp;
regs = (struct pt_regs *) sp;
- printk(" [<%016lx>] ", regs->psw.addr & PSW_ADDR_INSN);
- print_symbol("%s\n", regs->psw.addr & PSW_ADDR_INSN);
+ printk(" [<%016lx>] %pSR\n",
+ regs->psw.addr & PSW_ADDR_INSN,
+ (void *)(regs->psw.addr & PSW_ADDR_INSN));
low = sp;
sp = regs->gprs[15];
}
@@ -169,8 +172,9 @@ static void show_last_breaking_event(struct pt_regs *regs)
{
#ifdef CONFIG_64BIT
printk("Last Breaking-Event-Address:\n");
- printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
- print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
+ printk(" [<%016lx>] %pSR\n",
+ regs->args[0] & PSW_ADDR_INSN,
+ (void *)(regs->args[0] & PSW_ADDR_INSN));
#endif
}
@@ -201,10 +205,10 @@ void show_registers(struct pt_regs *regs)
char *mode;
mode = user_mode(regs) ? "User" : "Krnl";
- printk("%s PSW : %p %p",
- mode, (void *) regs->psw.mask,
- (void *) regs->psw.addr);
- print_symbol(" (%s)\n", regs->psw.addr & PSW_ADDR_INSN);
+ printk("%s PSW : %p %p (%pSR)\n",
+ mode, (void *)regs->psw.mask,
+ (void *)regs->psw.addr,
+ (void *)(regs->psw.addr & PSW_ADDR_INSN));
printk(" R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "
"P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),
mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),
--
1.7.8.112.g3fd21
next prev parent reply other threads:[~2012-12-13 1:43 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 18:18 [TRIVIAL PATCH 00/26] treewide: Add and use vsprintf extension %pSR Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 01/26] vsprintf: Add extension %pSR - print_symbol replacement Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 02/26] alpha: Convert print_symbol to %pSR Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 03/26] arm: " Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 04/26] arm64: " Joe Perches
2012-12-13 18:03 ` Catalin Marinas
2012-12-12 18:18 ` [TRIVIAL PATCH 05/26] avr32: " Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 06/26] c6x: " Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 07/26] ia64: " Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 08/26] m32r: " Joe Perches
2012-12-13 3:06 ` Hirokazu Takata
2013-04-29 13:21 ` Jiri Kosina
2013-04-30 12:56 ` Joe Perches
2013-04-30 21:11 ` Jiri Kosina
2012-12-12 18:18 ` [TRIVIAL PATCH 09/26] mn10300: " Joe Perches
2012-12-12 18:18 ` [TRIVIAL PATCH 10/26] openrisc: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 11/26] powerpc: " Joe Perches
2012-12-13 11:58 ` Arnd Bergmann
2013-01-10 5:48 ` Benjamin Herrenschmidt
2013-01-10 17:00 ` Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 12/26] s390: " Joe Perches
2012-12-13 1:22 ` Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 13/26] sh: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 14/26] um: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 15/26] unicore32: " Joe Perches
[not found] ` <001d01cdd8cd$371dfd60$a559f820$@mprc.pku.edu.cn>
2012-12-13 1:21 ` 答复: " Joe Perches
2012-12-13 2:00 ` Chen Gang
2012-12-13 2:26 ` Joe Perches
[not found] ` <19e6ea369e4455fc447c48f72bd433921bd0a703.1355335228.git.joe@perches.c om>
2012-12-13 5:05 ` guanxuetao
2012-12-12 18:19 ` [TRIVIAL PATCH 16/26] x86: " Joe Perches
2012-12-12 21:09 ` Borislav Petkov
2012-12-12 21:30 ` Joe Perches
2012-12-12 21:48 ` Borislav Petkov
2012-12-12 21:49 ` Luck, Tony
2012-12-12 22:23 ` Joe Perches
2012-12-12 22:45 ` Borislav Petkov
2012-12-13 18:23 ` Joe Perches
2012-12-13 18:37 ` Borislav Petkov
2012-12-13 18:42 ` H. Peter Anvin
2012-12-13 19:05 ` Borislav Petkov
2012-12-13 21:35 ` H. Peter Anvin
2012-12-13 18:57 ` Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 17/26] xtensa: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 18/26] drivers: base: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 19/26] gfs2: " Joe Perches
2012-12-13 10:57 ` Steven Whitehouse
2013-04-29 13:23 ` Jiri Kosina
2012-12-12 18:19 ` [TRIVIAL PATCH 20/26] sysfs: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 21/26] irq: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 22/26] smp_processor_id: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 23/26] mm: " Joe Perches
2012-12-12 20:08 ` Christoph Lameter
2013-04-29 13:24 ` Jiri Kosina
2012-12-12 18:19 ` [TRIVIAL PATCH 24/26] xtensa: " Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 25/26] x86: head_64.S: Use vsprintf extension %pSR not print_symbol Joe Perches
2012-12-12 18:19 ` [TRIVIAL PATCH 26/26] kallsyms: Remove print_symbol Joe Perches
2012-12-12 19:30 ` [TRIVIAL PATCH V2 24/26] Documentation: Convert print_symbol to %pSR Joe Perches
2012-12-13 1:43 ` Joe Perches [this message]
2012-12-13 19:13 ` [TRIVIAL PATCH V2 16/26] x86: " Joe Perches
2013-01-08 5:52 ` [TRIVIAL PATCH 00/26] treewide: Add and use vsprintf extension %pSR Joe Perches
2013-01-08 20:33 ` Jiri Kosina
2013-02-20 6:00 ` Joe Perches
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=1355363029.2164.14.camel@joe-AO722 \
--to=joe@perches.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux390@de.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=trivial@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