Skip to content

Commit c8fdf82

Browse files
stffrdhrnstffrdhrn
committed
openrisc: traps: Convert printks to pr_<level> macros
The pr_* macros are the convention and my upcoming patches add even more printk's. Use this opportunity to convert the printks in this file to the pr_* macros to avoid patch check warnings. Signed-off-by: Stafford Horne <shorne@gmail.com>
1 parent 23c6e90 commit c8fdf82

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎arch/openrisc/kernel/traps.c

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ static void print_trace(void *data, unsigned long addr, int reliable)
5151
{
5252
const char *loglvl = data;
5353

54-
printk("%s[<%p>] %s%pS\n", loglvl, (void *) addr, reliable ? "" : "? ",
55-
(void *) addr);
54+
pr_info("%s[<%p>] %s%pS\n", loglvl, (void *) addr, reliable ? "" : "? ",
55+
(void *) addr);
5656
}
5757

5858
static void print_data(unsigned long base_addr, unsigned long word, int i)
5959
{
6060
if (i == 0)
61-
printk("(%08lx:)\t%08lx", base_addr + (i * 4), word);
61+
pr_info("(%08lx:)\t%08lx", base_addr + (i * 4), word);
6262
else
63-
printk(" %08lx:\t%08lx", base_addr + (i * 4), word);
63+
pr_info(" %08lx:\t%08lx", base_addr + (i * 4), word);
6464
}
6565

6666
/* displays a short stack trace */
@@ -69,7 +69,7 @@ void show_stack(struct task_struct *task, unsigned long *esp, const char *loglvl
6969
if (esp == NULL)
7070
esp = (unsigned long *)&esp;
7171

72-
printk("%sCall trace:\n", loglvl);
72+
pr_info("%sCall trace:\n", loglvl);
7373
unwind_stack((void *)loglvl, esp, print_trace);
7474
}
7575

@@ -83,57 +83,57 @@ void show_registers(struct pt_regs *regs)
8383
if (user_mode(regs))
8484
in_kernel = 0;
8585

86-
printk("CPU #: %d\n"
87-
" PC: %08lx SR: %08lx SP: %08lx FPCSR: %08lx\n",
88-
smp_processor_id(), regs->pc, regs->sr, regs->sp,
89-
regs->fpcsr);
90-
printk("GPR00: %08lx GPR01: %08lx GPR02: %08lx GPR03: %08lx\n",
91-
0L, regs->gpr[1], regs->gpr[2], regs->gpr[3]);
92-
printk("GPR04: %08lx GPR05: %08lx GPR06: %08lx GPR07: %08lx\n",
93-
regs->gpr[4], regs->gpr[5], regs->gpr[6], regs->gpr[7]);
94-
printk("GPR08: %08lx GPR09: %08lx GPR10: %08lx GPR11: %08lx\n",
95-
regs->gpr[8], regs->gpr[9], regs->gpr[10], regs->gpr[11]);
96-
printk("GPR12: %08lx GPR13: %08lx GPR14: %08lx GPR15: %08lx\n",
97-
regs->gpr[12], regs->gpr[13], regs->gpr[14], regs->gpr[15]);
98-
printk("GPR16: %08lx GPR17: %08lx GPR18: %08lx GPR19: %08lx\n",
99-
regs->gpr[16], regs->gpr[17], regs->gpr[18], regs->gpr[19]);
100-
printk("GPR20: %08lx GPR21: %08lx GPR22: %08lx GPR23: %08lx\n",
101-
regs->gpr[20], regs->gpr[21], regs->gpr[22], regs->gpr[23]);
102-
printk("GPR24: %08lx GPR25: %08lx GPR26: %08lx GPR27: %08lx\n",
103-
regs->gpr[24], regs->gpr[25], regs->gpr[26], regs->gpr[27]);
104-
printk("GPR28: %08lx GPR29: %08lx GPR30: %08lx GPR31: %08lx\n",
105-
regs->gpr[28], regs->gpr[29], regs->gpr[30], regs->gpr[31]);
106-
printk(" RES: %08lx oGPR11: %08lx\n",
107-
regs->gpr[11], regs->orig_gpr11);
108-
109-
printk("Process %s (pid: %d, stackpage=%08lx)\n",
110-
current->comm, current->pid, (unsigned long)current);
86+
pr_info("CPU #: %d\n"
87+
" PC: %08lx SR: %08lx SP: %08lx FPCSR: %08lx\n",
88+
smp_processor_id(), regs->pc, regs->sr, regs->sp,
89+
regs->fpcsr);
90+
pr_info("GPR00: %08lx GPR01: %08lx GPR02: %08lx GPR03: %08lx\n",
91+
0L, regs->gpr[1], regs->gpr[2], regs->gpr[3]);
92+
pr_info("GPR04: %08lx GPR05: %08lx GPR06: %08lx GPR07: %08lx\n",
93+
regs->gpr[4], regs->gpr[5], regs->gpr[6], regs->gpr[7]);
94+
pr_info("GPR08: %08lx GPR09: %08lx GPR10: %08lx GPR11: %08lx\n",
95+
regs->gpr[8], regs->gpr[9], regs->gpr[10], regs->gpr[11]);
96+
pr_info("GPR12: %08lx GPR13: %08lx GPR14: %08lx GPR15: %08lx\n",
97+
regs->gpr[12], regs->gpr[13], regs->gpr[14], regs->gpr[15]);
98+
pr_info("GPR16: %08lx GPR17: %08lx GPR18: %08lx GPR19: %08lx\n",
99+
regs->gpr[16], regs->gpr[17], regs->gpr[18], regs->gpr[19]);
100+
pr_info("GPR20: %08lx GPR21: %08lx GPR22: %08lx GPR23: %08lx\n",
101+
regs->gpr[20], regs->gpr[21], regs->gpr[22], regs->gpr[23]);
102+
pr_info("GPR24: %08lx GPR25: %08lx GPR26: %08lx GPR27: %08lx\n",
103+
regs->gpr[24], regs->gpr[25], regs->gpr[26], regs->gpr[27]);
104+
pr_info("GPR28: %08lx GPR29: %08lx GPR30: %08lx GPR31: %08lx\n",
105+
regs->gpr[28], regs->gpr[29], regs->gpr[30], regs->gpr[31]);
106+
pr_info(" RES: %08lx oGPR11: %08lx\n",
107+
regs->gpr[11], regs->orig_gpr11);
108+
109+
pr_info("Process %s (pid: %d, stackpage=%08lx)\n",
110+
current->comm, current->pid, (unsigned long)current);
111111
/*
112112
* When in-kernel, we also print out the stack and code at the
113113
* time of the fault..
114114
*/
115115
if (in_kernel) {
116116

117-
printk("\nStack: ");
117+
pr_info("\nStack: ");
118118
show_stack(NULL, (unsigned long *)esp, KERN_EMERG);
119119

120120
if (esp < PAGE_OFFSET)
121121
goto bad_stack;
122122

123-
printk("\n");
123+
pr_info("\n");
124124
for (i = -8; i < 24; i += 1) {
125125
unsigned long word;
126126

127127
if (__get_user(word, &((unsigned long *)esp)[i])) {
128128
bad_stack:
129-
printk(" Bad Stack value.");
129+
pr_info(" Bad Stack value.");
130130
break;
131131
}
132132

133133
print_data(esp, word, i);
134134
}
135135

136-
printk("\nCode: ");
136+
pr_info("\nCode: ");
137137
if (regs->pc < PAGE_OFFSET)
138138
goto bad;
139139

@@ -142,25 +142,25 @@ void show_registers(struct pt_regs *regs)
142142

143143
if (__get_user(word, &((unsigned long *)regs->pc)[i])) {
144144
bad:
145-
printk(" Bad PC value.");
145+
pr_info(" Bad PC value.");
146146
break;
147147
}
148148

149149
print_data(regs->pc, word, i);
150150
}
151151
}
152-
printk("\n");
152+
pr_info("\n");
153153
}
154154

155155
/* This is normally the 'Oops' routine */
156156
void __noreturn die(const char *str, struct pt_regs *regs, long err)
157157
{
158158

159159
console_verbose();
160-
printk("\n%s#: %04lx\n", str, err & 0xffff);
160+
pr_emerg("\n%s#: %04lx\n", str, err & 0xffff);
161161
show_registers(regs);
162162
#ifdef CONFIG_JUMP_UPON_UNHANDLED_EXCEPTION
163-
printk("\n\nUNHANDLED_EXCEPTION: entering infinite loop\n");
163+
pr_emerg("\n\nUNHANDLED_EXCEPTION: entering infinite loop\n");
164164

165165
/* shut down interrupts */
166166
local_irq_disable();
@@ -173,8 +173,8 @@ void __noreturn die(const char *str, struct pt_regs *regs, long err)
173173

174174
asmlinkage void unhandled_exception(struct pt_regs *regs, int ea, int vector)
175175
{
176-
printk("Unable to handle exception at EA =0x%x, vector 0x%x",
177-
ea, vector);
176+
pr_emerg("Unable to handle exception at EA =0x%x, vector 0x%x",
177+
ea, vector);
178178
die("Oops", regs, 9);
179179
}
180180

@@ -211,7 +211,7 @@ asmlinkage void do_unaligned_access(struct pt_regs *regs, unsigned long address)
211211
/* Send a SIGBUS */
212212
force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)address);
213213
} else {
214-
printk("KERNEL: Unaligned Access 0x%.8lx\n", address);
214+
pr_emerg("KERNEL: Unaligned Access 0x%.8lx\n", address);
215215
show_registers(regs);
216216
die("Die:", regs, address);
217217
}
@@ -224,7 +224,7 @@ asmlinkage void do_bus_fault(struct pt_regs *regs, unsigned long address)
224224
/* Send a SIGBUS */
225225
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
226226
} else { /* Kernel mode */
227-
printk("KERNEL: Bus error (SIGBUS) 0x%.8lx\n", address);
227+
pr_emerg("KERNEL: Bus error (SIGBUS) 0x%.8lx\n", address);
228228
show_registers(regs);
229229
die("Die:", regs, address);
230230
}
@@ -419,8 +419,8 @@ asmlinkage void do_illegal_instruction(struct pt_regs *regs,
419419
/* Send a SIGILL */
420420
force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)address);
421421
} else { /* Kernel mode */
422-
printk("KERNEL: Illegal instruction (SIGILL) 0x%.8lx\n",
423-
address);
422+
pr_emerg("KERNEL: Illegal instruction (SIGILL) 0x%.8lx\n",
423+
address);
424424
show_registers(regs);
425425
die("Die:", regs, address);
426426
}

0 commit comments

Comments
 (0)