Commit c8fdf82e authored by Stafford Horne's avatar Stafford Horne
Browse files

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: default avatarStafford Horne <shorne@gmail.com>
parent 23c6e901

arch/openrisc/kernel/traps.c

+44 −44
Original line number Diff line number Diff line
@@ -51,16 +51,16 @@ static void print_trace(void *data, unsigned long addr, int reliable) 
{

	const char *loglvl = data;



	printk("%s[<%p>] %s%pS\n", loglvl, (void *) addr, reliable ? "" : "? ",

	pr_info("%s[<%p>] %s%pS\n", loglvl, (void *) addr, reliable ? "" : "? ",

		(void *) addr);

}



static void print_data(unsigned long base_addr, unsigned long word, int i)

{

	if (i == 0)

		printk("(%08lx:)\t%08lx", base_addr + (i * 4), word);

		pr_info("(%08lx:)\t%08lx", base_addr + (i * 4), word);

	else

		printk(" %08lx:\t%08lx", base_addr + (i * 4), word);

		pr_info(" %08lx:\t%08lx", base_addr + (i * 4), word);

}



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

		esp = (unsigned long *)&esp;



	printk("%sCall trace:\n", loglvl);

	pr_info("%sCall trace:\n", loglvl);

	unwind_stack((void *)loglvl, esp, print_trace);

}
@@ -83,30 +83,30 @@ void show_registers(struct pt_regs *regs) 
	if (user_mode(regs))

		in_kernel = 0;



	printk("CPU #: %d\n"

	pr_info("CPU #: %d\n"

		"   PC: %08lx    SR: %08lx    SP: %08lx FPCSR: %08lx\n",

		smp_processor_id(), regs->pc, regs->sr, regs->sp,

		regs->fpcsr);

	printk("GPR00: %08lx GPR01: %08lx GPR02: %08lx GPR03: %08lx\n",

	pr_info("GPR00: %08lx GPR01: %08lx GPR02: %08lx GPR03: %08lx\n",

		0L, regs->gpr[1], regs->gpr[2], regs->gpr[3]);

	printk("GPR04: %08lx GPR05: %08lx GPR06: %08lx GPR07: %08lx\n",

	pr_info("GPR04: %08lx GPR05: %08lx GPR06: %08lx GPR07: %08lx\n",

		regs->gpr[4], regs->gpr[5], regs->gpr[6], regs->gpr[7]);

	printk("GPR08: %08lx GPR09: %08lx GPR10: %08lx GPR11: %08lx\n",

	pr_info("GPR08: %08lx GPR09: %08lx GPR10: %08lx GPR11: %08lx\n",

		regs->gpr[8], regs->gpr[9], regs->gpr[10], regs->gpr[11]);

	printk("GPR12: %08lx GPR13: %08lx GPR14: %08lx GPR15: %08lx\n",

	pr_info("GPR12: %08lx GPR13: %08lx GPR14: %08lx GPR15: %08lx\n",

		regs->gpr[12], regs->gpr[13], regs->gpr[14], regs->gpr[15]);

	printk("GPR16: %08lx GPR17: %08lx GPR18: %08lx GPR19: %08lx\n",

	pr_info("GPR16: %08lx GPR17: %08lx GPR18: %08lx GPR19: %08lx\n",

		regs->gpr[16], regs->gpr[17], regs->gpr[18], regs->gpr[19]);

	printk("GPR20: %08lx GPR21: %08lx GPR22: %08lx GPR23: %08lx\n",

	pr_info("GPR20: %08lx GPR21: %08lx GPR22: %08lx GPR23: %08lx\n",

		regs->gpr[20], regs->gpr[21], regs->gpr[22], regs->gpr[23]);

	printk("GPR24: %08lx GPR25: %08lx GPR26: %08lx GPR27: %08lx\n",

	pr_info("GPR24: %08lx GPR25: %08lx GPR26: %08lx GPR27: %08lx\n",

		regs->gpr[24], regs->gpr[25], regs->gpr[26], regs->gpr[27]);

	printk("GPR28: %08lx GPR29: %08lx GPR30: %08lx GPR31: %08lx\n",

	pr_info("GPR28: %08lx GPR29: %08lx GPR30: %08lx GPR31: %08lx\n",

		regs->gpr[28], regs->gpr[29], regs->gpr[30], regs->gpr[31]);

	printk("  RES: %08lx oGPR11: %08lx\n",

	pr_info("  RES: %08lx oGPR11: %08lx\n",

		regs->gpr[11], regs->orig_gpr11);



	printk("Process %s (pid: %d, stackpage=%08lx)\n",

	pr_info("Process %s (pid: %d, stackpage=%08lx)\n",

		current->comm, current->pid, (unsigned long)current);

	/*

	 * When in-kernel, we also print out the stack and code at the
@@ -114,26 +114,26 @@ void show_registers(struct pt_regs *regs) 
	 */

	if (in_kernel) {



		printk("\nStack: ");

		pr_info("\nStack: ");

		show_stack(NULL, (unsigned long *)esp, KERN_EMERG);



		if (esp < PAGE_OFFSET)

			goto bad_stack;



		printk("\n");

		pr_info("\n");

		for (i = -8; i < 24; i += 1) {

			unsigned long word;



			if (__get_user(word, &((unsigned long *)esp)[i])) {

bad_stack:

				printk(" Bad Stack value.");

				pr_info(" Bad Stack value.");

				break;

			}



			print_data(esp, word, i);

		}



		printk("\nCode: ");

		pr_info("\nCode: ");

		if (regs->pc < PAGE_OFFSET)

			goto bad;
@@ -142,14 +142,14 @@ void show_registers(struct pt_regs *regs) 


			if (__get_user(word, &((unsigned long *)regs->pc)[i])) {

bad:

				printk(" Bad PC value.");

				pr_info(" Bad PC value.");

				break;

			}



			print_data(regs->pc, word, i);

		}

	}

	printk("\n");

	pr_info("\n");

}



/* This is normally the 'Oops' routine */
@@ -157,10 +157,10 @@ void __noreturn die(const char *str, struct pt_regs *regs, long err) 
{



	console_verbose();

	printk("\n%s#: %04lx\n", str, err & 0xffff);

	pr_emerg("\n%s#: %04lx\n", str, err & 0xffff);

	show_registers(regs);

#ifdef CONFIG_JUMP_UPON_UNHANDLED_EXCEPTION

	printk("\n\nUNHANDLED_EXCEPTION: entering infinite loop\n");

	pr_emerg("\n\nUNHANDLED_EXCEPTION: entering infinite loop\n");



	/* shut down interrupts */

	local_irq_disable();
@@ -173,7 +173,7 @@ void __noreturn die(const char *str, struct pt_regs *regs, long err) 


asmlinkage void unhandled_exception(struct pt_regs *regs, int ea, int vector)

{

	printk("Unable to handle exception at EA =0x%x, vector 0x%x",

	pr_emerg("Unable to handle exception at EA =0x%x, vector 0x%x",

		 ea, vector);

	die("Oops", regs, 9);

}
@@ -211,7 +211,7 @@ asmlinkage void do_unaligned_access(struct pt_regs *regs, unsigned long address) 
		/* Send a SIGBUS */

		force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)address);

	} else {

		printk("KERNEL: Unaligned Access 0x%.8lx\n", address);

		pr_emerg("KERNEL: Unaligned Access 0x%.8lx\n", address);

		show_registers(regs);

		die("Die:", regs, address);

	}
@@ -224,7 +224,7 @@ asmlinkage void do_bus_fault(struct pt_regs *regs, unsigned long address) 
		/* Send a SIGBUS */

		force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);

	} else {		/* Kernel mode */

		printk("KERNEL: Bus error (SIGBUS) 0x%.8lx\n", address);

		pr_emerg("KERNEL: Bus error (SIGBUS) 0x%.8lx\n", address);

		show_registers(regs);

		die("Die:", regs, address);

	}
@@ -419,7 +419,7 @@ asmlinkage void do_illegal_instruction(struct pt_regs *regs, 
		/* Send a SIGILL */

		force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)address);

	} else {		/* Kernel mode */

		printk("KERNEL: Illegal instruction (SIGILL) 0x%.8lx\n",

		pr_emerg("KERNEL: Illegal instruction (SIGILL) 0x%.8lx\n",

			 address);

		show_registers(regs);

		die("Die:", regs, address);