Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1bb8289 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Make show_code static and add __user tag 



Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 01bebc66

arch/mips/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void dump_stack(void) 


EXPORT_SYMBOL(dump_stack);



void show_code(unsigned int *pc)

static void show_code(unsigned int __user *pc)

{

	long i;
@@ -305,7 +305,7 @@ void show_registers(struct pt_regs *regs) 
	printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",

	        current->comm, current->pid, current_thread_info(), current);

	show_stacktrace(current, regs);

	show_code((unsigned int *) regs->cp0_epc);

	show_code((unsigned int __user *) regs->cp0_epc);

	printk("\n");

}
@@ -865,7 +865,7 @@ asmlinkage void do_mcheck(struct pt_regs *regs) 
		dump_tlb_all();

	}



	show_code((unsigned int *) regs->cp0_epc);

	show_code((unsigned int __user *) regs->cp0_epc);



	/*

	 * Some chips may have other causes of machine check (e.g. SB1