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"
This commit is contained in:
commit
f589b86d4b
5 changed files with 10 additions and 12 deletions
|
@ -638,18 +638,18 @@ void rtas_halt(void)
|
|||
/* Must be in the RMO region, so we place it here */
|
||||
static char rtas_os_term_buf[2048];
|
||||
|
||||
void rtas_panic_msg(char *str)
|
||||
{
|
||||
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
|
||||
}
|
||||
|
||||
void rtas_os_term(void)
|
||||
void rtas_os_term(char *str)
|
||||
{
|
||||
int status;
|
||||
|
||||
if (panic_timeout)
|
||||
return;
|
||||
|
||||
if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
|
||||
return;
|
||||
|
||||
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
|
||||
|
||||
do {
|
||||
status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
|
||||
__pa(rtas_os_term_buf));
|
||||
|
|
|
@ -507,8 +507,7 @@ define_machine(pseries) {
|
|||
.restart = rtas_restart,
|
||||
.power_off = pSeries_power_off,
|
||||
.halt = rtas_halt,
|
||||
.panic = rtas_panic_msg,
|
||||
.machine_shutdown = rtas_os_term,
|
||||
.panic = rtas_os_term,
|
||||
.get_boot_time = rtas_get_boot_time,
|
||||
.get_rtc_time = rtas_get_rtc_time,
|
||||
.set_rtc_time = rtas_set_rtc_time,
|
||||
|
|
|
@ -719,7 +719,7 @@ CONFIG_DEBUG_INFO=y
|
|||
CONFIG_FORCED_INLINING=y
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_KGDB is not set
|
||||
CONFIG_XMON=y
|
||||
# CONFIG_XMON is not set
|
||||
# CONFIG_BDI_SWITCH is not set
|
||||
# CONFIG_SERIAL_TEXT_DEBUG is not set
|
||||
|
||||
|
|
|
@ -720,7 +720,7 @@ CONFIG_DEBUG_INFO=y
|
|||
CONFIG_FORCED_INLINING=y
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_KGDB is not set
|
||||
CONFIG_XMON=y
|
||||
# CONFIG_XMON is not set
|
||||
# CONFIG_BDI_SWITCH is not set
|
||||
# CONFIG_SERIAL_TEXT_DEBUG is not set
|
||||
|
||||
|
|
|
@ -164,8 +164,7 @@ extern int rtas_call(int token, int, int, int *, ...);
|
|||
extern void rtas_restart(char *cmd);
|
||||
extern void rtas_power_off(void);
|
||||
extern void rtas_halt(void);
|
||||
extern void rtas_panic_msg(char *str);
|
||||
extern void rtas_os_term(void);
|
||||
extern void rtas_os_term(char *str);
|
||||
extern int rtas_get_sensor(int sensor, int index, int *state);
|
||||
extern int rtas_get_power_level(int powerdomain, int *level);
|
||||
extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);
|
||||
|
|
Reference in a new issue