tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc
Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"

Linus Torvalds f589b86d c8b1ef88

+10 -12
+6 -6
arch/powerpc/kernel/rtas.c
··· 638 638 /* Must be in the RMO region, so we place it here */ 639 639 static char rtas_os_term_buf[2048]; 640 640 641 - void rtas_panic_msg(char *str) 642 - { 643 - snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str); 644 - } 645 - 646 - void rtas_os_term(void) 641 + void rtas_os_term(char *str) 647 642 { 648 643 int status; 649 644 645 + if (panic_timeout) 646 + return; 647 + 650 648 if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term")) 651 649 return; 650 + 651 + snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str); 652 652 653 653 do { 654 654 status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
+1 -2
arch/powerpc/platforms/pseries/setup.c
··· 507 507 .restart = rtas_restart, 508 508 .power_off = pSeries_power_off, 509 509 .halt = rtas_halt, 510 - .panic = rtas_panic_msg, 511 - .machine_shutdown = rtas_os_term, 510 + .panic = rtas_os_term, 512 511 .get_boot_time = rtas_get_boot_time, 513 512 .get_rtc_time = rtas_get_rtc_time, 514 513 .set_rtc_time = rtas_set_rtc_time,
+1 -1
arch/ppc/configs/ml300_defconfig
··· 719 719 CONFIG_FORCED_INLINING=y 720 720 # CONFIG_RCU_TORTURE_TEST is not set 721 721 # CONFIG_KGDB is not set 722 - CONFIG_XMON=y 722 + # CONFIG_XMON is not set 723 723 # CONFIG_BDI_SWITCH is not set 724 724 # CONFIG_SERIAL_TEXT_DEBUG is not set 725 725
+1 -1
arch/ppc/configs/ml403_defconfig
··· 720 720 CONFIG_FORCED_INLINING=y 721 721 # CONFIG_RCU_TORTURE_TEST is not set 722 722 # CONFIG_KGDB is not set 723 - CONFIG_XMON=y 723 + # CONFIG_XMON is not set 724 724 # CONFIG_BDI_SWITCH is not set 725 725 # CONFIG_SERIAL_TEXT_DEBUG is not set 726 726
+1 -2
include/asm-powerpc/rtas.h
··· 164 164 extern void rtas_restart(char *cmd); 165 165 extern void rtas_power_off(void); 166 166 extern void rtas_halt(void); 167 - extern void rtas_panic_msg(char *str); 168 - extern void rtas_os_term(void); 167 + extern void rtas_os_term(char *str); 169 168 extern int rtas_get_sensor(int sensor, int index, int *state); 170 169 extern int rtas_get_power_level(int powerdomain, int *level); 171 170 extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);