| traps.c (bbbc8032b00f8ef287894425fbdb691049e28d39) | traps.c (265d6e588d87194c2fe2d6c240247f0264e0c19b) |
|---|---|
| 1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) 4 * Copyright 2007-2010 Freescale Semiconductor, Inc. 5 * 6 * Modified by Cort Dougan (cort@cs.nmt.edu) 7 * and Paul Mackerras (paulus@samba.org) 8 */ --- 499 unchanged lines hidden (view full) --- 508 mdelay(2*MSEC_PER_SEC); /* Wait a little while for others to print */ 509 add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); 510 nmi_panic(regs, "System Reset"); 511 512out: 513#ifdef CONFIG_PPC_BOOK3S_64 514 BUG_ON(get_paca()->in_nmi == 0); 515 if (get_paca()->in_nmi > 1) | 1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) 4 * Copyright 2007-2010 Freescale Semiconductor, Inc. 5 * 6 * Modified by Cort Dougan (cort@cs.nmt.edu) 7 * and Paul Mackerras (paulus@samba.org) 8 */ --- 499 unchanged lines hidden (view full) --- 508 mdelay(2*MSEC_PER_SEC); /* Wait a little while for others to print */ 509 add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); 510 nmi_panic(regs, "System Reset"); 511 512out: 513#ifdef CONFIG_PPC_BOOK3S_64 514 BUG_ON(get_paca()->in_nmi == 0); 515 if (get_paca()->in_nmi > 1) |
| 516 nmi_panic(regs, "Unrecoverable nested System Reset"); | 516 die("Unrecoverable nested System Reset", regs, SIGABRT); |
| 517#endif 518 /* Must die if the interrupt is not recoverable */ 519 if (!(regs->msr & MSR_RI)) | 517#endif 518 /* Must die if the interrupt is not recoverable */ 519 if (!(regs->msr & MSR_RI)) |
| 520 nmi_panic(regs, "Unrecoverable System Reset"); | 520 die("Unrecoverable System Reset", regs, SIGABRT); |
| 521 522 if (saved_hsrrs) { 523 mtspr(SPRN_HSRR0, hsrr0); 524 mtspr(SPRN_HSRR1, hsrr1); 525 } 526 527 if (!nested) 528 nmi_exit(); --- 341 unchanged lines hidden (view full) --- 870 871 if (!nested) 872 nmi_exit(); 873 874 die("Machine check", regs, SIGBUS); 875 876 /* Must die if the interrupt is not recoverable */ 877 if (!(regs->msr & MSR_RI)) | 521 522 if (saved_hsrrs) { 523 mtspr(SPRN_HSRR0, hsrr0); 524 mtspr(SPRN_HSRR1, hsrr1); 525 } 526 527 if (!nested) 528 nmi_exit(); --- 341 unchanged lines hidden (view full) --- 870 871 if (!nested) 872 nmi_exit(); 873 874 die("Machine check", regs, SIGBUS); 875 876 /* Must die if the interrupt is not recoverable */ 877 if (!(regs->msr & MSR_RI)) |
| 878 nmi_panic(regs, "Unrecoverable Machine check"); | 878 die("Unrecoverable Machine check", regs, SIGBUS); |
| 879 880 return; 881 882bail: 883 if (!nested) 884 nmi_exit(); 885} 886 --- 1430 unchanged lines hidden --- | 879 880 return; 881 882bail: 883 if (!nested) 884 nmi_exit(); 885} 886 --- 1430 unchanged lines hidden --- |