[PATCH] powerpc/traps: merge unrecoverable_exception() and nonrecoverable_exception()

[Christophe LEROY]

Le 25/09/2018 à 03:29, Michael Ellerman a écrit :
> Christophe Leroy <christophe.leroy at c-s.fr> writes:
> 
>> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
>> index 6ab66a88db14..4567eeb6524e 100644
>> --- a/arch/powerpc/kernel/traps.c
>> +++ b/arch/powerpc/kernel/traps.c
>> @@ -2090,8 +2082,9 @@ void SPEFloatingPointRoundException(struct pt_regs *regs)
>>    */
>>   void unrecoverable_exception(struct pt_regs *regs)
>>   {
>> -	printk(KERN_EMERG "Unrecoverable exception %lx at %lx\n",
>> -	       regs->trap, regs->nip);
>> +	pr_emerg("Unrecoverable exception %lx at %lx (msr=%lx)\n",
>> +		 regs->trap, regs->nip, regs->msr);
>> +	debugger(regs);
>>   	die("Unrecoverable exception", regs, SIGABRT);
> 
> die() already calls debugger() if the trap is != 0x100.
> 
> I don't think we want to call it twice?

Oh, good spot. So nonrecoverable_exception() is calling it twice.

I'll fix the patch. Thanks.

Christophe