aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r--arch/arm/kernel/process.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index adabeababeb0..806d287e3e53 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -47,14 +47,14 @@ unsigned long __stack_chk_guard __read_mostly;
47EXPORT_SYMBOL(__stack_chk_guard); 47EXPORT_SYMBOL(__stack_chk_guard);
48#endif 48#endif
49 49
50static const char *processor_modes[] = { 50static const char *processor_modes[] __maybe_unused = {
51 "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , 51 "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" ,
52 "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", 52 "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26",
53 "USER_32", "FIQ_32" , "IRQ_32" , "SVC_32" , "UK4_32" , "UK5_32" , "UK6_32" , "ABT_32" , 53 "USER_32", "FIQ_32" , "IRQ_32" , "SVC_32" , "UK4_32" , "UK5_32" , "UK6_32" , "ABT_32" ,
54 "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32" 54 "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32"
55}; 55};
56 56
57static const char *isa_modes[] = { 57static const char *isa_modes[] __maybe_unused = {
58 "ARM" , "Thumb" , "Jazelle", "ThumbEE" 58 "ARM" , "Thumb" , "Jazelle", "ThumbEE"
59}; 59};
60 60
@@ -270,12 +270,17 @@ void __show_regs(struct pt_regs *regs)
270 buf[3] = flags & PSR_V_BIT ? 'V' : 'v'; 270 buf[3] = flags & PSR_V_BIT ? 'V' : 'v';
271 buf[4] = '\0'; 271 buf[4] = '\0';
272 272
273#ifndef CONFIG_CPU_V7M
273 printk("Flags: %s IRQs o%s FIQs o%s Mode %s ISA %s Segment %s\n", 274 printk("Flags: %s IRQs o%s FIQs o%s Mode %s ISA %s Segment %s\n",
274 buf, interrupts_enabled(regs) ? "n" : "ff", 275 buf, interrupts_enabled(regs) ? "n" : "ff",
275 fast_interrupts_enabled(regs) ? "n" : "ff", 276 fast_interrupts_enabled(regs) ? "n" : "ff",
276 processor_modes[processor_mode(regs)], 277 processor_modes[processor_mode(regs)],
277 isa_modes[isa_mode(regs)], 278 isa_modes[isa_mode(regs)],
278 get_fs() == get_ds() ? "kernel" : "user"); 279 get_fs() == get_ds() ? "kernel" : "user");
280#else
281 printk("xPSR: %08lx\n", regs->ARM_cpsr);
282#endif
283
279#ifdef CONFIG_CPU_CP15 284#ifdef CONFIG_CPU_CP15
280 { 285 {
281 unsigned int ctrl; 286 unsigned int ctrl;