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

Commit f589b86d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents c8b1ef88 b80fa3cc

arch/powerpc/kernel/rtas.c

+6 −6
Original line number Diff line number Diff line
@@ -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));

arch/powerpc/platforms/pseries/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

arch/ppc/configs/ml300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/ppc/configs/ml403_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

include/asm-powerpc/rtas.h

+1 −2
Original line number Diff line number Diff line
@@ -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);