diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-12-16 04:38:57 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-02-03 11:30:21 -0500 |
commit | e2e55fde3f2eaeb1d341508108a51a61dd0fb470 (patch) | |
tree | d86a8d03852ed10d05919e2e451e893f14c6ec6c /arch/arm/kernel/process.c | |
parent | 3f18b1bf599d3d13cd81fdf6bf869c458772adfe (diff) |
ARM: show_regs: on v7-M there are no FIQs, different processor modes, ...
no indication about irqs in PSR and only a single ISA. So skip the whole
decoding and just print the xPSR on v7-M.
Also mark two static variables as __maybe_unused to prevent the compiler
from emitting:
arch/arm/kernel/process.c:51:20: warning: 'processor_modes' defined but not used [-Wunused-variable]
arch/arm/kernel/process.c:58:20: warning: 'isa_modes' defined but not used [-Wunused-variable]
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 92f7b15dd221..204f7d273319 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -48,14 +48,14 @@ unsigned long __stack_chk_guard __read_mostly; | |||
48 | EXPORT_SYMBOL(__stack_chk_guard); | 48 | EXPORT_SYMBOL(__stack_chk_guard); |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | static const char *processor_modes[] = { | 51 | static const char *processor_modes[] __maybe_unused = { |
52 | "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , | 52 | "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , |
53 | "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", | 53 | "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", |
54 | "USER_32", "FIQ_32" , "IRQ_32" , "SVC_32" , "UK4_32" , "UK5_32" , "UK6_32" , "ABT_32" , | 54 | "USER_32", "FIQ_32" , "IRQ_32" , "SVC_32" , "UK4_32" , "UK5_32" , "UK6_32" , "ABT_32" , |
55 | "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32" | 55 | "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32" |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static const char *isa_modes[] = { | 58 | static const char *isa_modes[] __maybe_unused = { |
59 | "ARM" , "Thumb" , "Jazelle", "ThumbEE" | 59 | "ARM" , "Thumb" , "Jazelle", "ThumbEE" |
60 | }; | 60 | }; |
61 | 61 | ||
@@ -276,12 +276,17 @@ void __show_regs(struct pt_regs *regs) | |||
276 | buf[3] = flags & PSR_V_BIT ? 'V' : 'v'; | 276 | buf[3] = flags & PSR_V_BIT ? 'V' : 'v'; |
277 | buf[4] = '\0'; | 277 | buf[4] = '\0'; |
278 | 278 | ||
279 | #ifndef CONFIG_CPU_V7M | ||
279 | printk("Flags: %s IRQs o%s FIQs o%s Mode %s ISA %s Segment %s\n", | 280 | printk("Flags: %s IRQs o%s FIQs o%s Mode %s ISA %s Segment %s\n", |
280 | buf, interrupts_enabled(regs) ? "n" : "ff", | 281 | buf, interrupts_enabled(regs) ? "n" : "ff", |
281 | fast_interrupts_enabled(regs) ? "n" : "ff", | 282 | fast_interrupts_enabled(regs) ? "n" : "ff", |
282 | processor_modes[processor_mode(regs)], | 283 | processor_modes[processor_mode(regs)], |
283 | isa_modes[isa_mode(regs)], | 284 | isa_modes[isa_mode(regs)], |
284 | get_fs() == get_ds() ? "kernel" : "user"); | 285 | get_fs() == get_ds() ? "kernel" : "user"); |
286 | #else | ||
287 | printk("xPSR: %08lx\n", regs->ARM_cpsr); | ||
288 | #endif | ||
289 | |||
285 | #ifdef CONFIG_CPU_CP15 | 290 | #ifdef CONFIG_CPU_CP15 |
286 | { | 291 | { |
287 | unsigned int ctrl; | 292 | unsigned int ctrl; |