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

Commit 64ff91ff authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Remove ppc64_boot_msg 



ppc64_boot_msg is meant to be a boot debug aid, but
is only used in one spot. Get rid of it, and save
ourseleves a couple of lines in the kernel log
buffer.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent adb7cd73

arch/powerpc/include/asm/machdep.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -342,16 +342,6 @@ extern sys_ctrler_t sys_ctrler; 




#endif /* CONFIG_PPC_PMAC */

#endif /* CONFIG_PPC_PMAC */







/* Functions to produce codes on the leds.

 * The SRC code should be unique for the message category and should

 * be limited to the lower 24 bits (the upper 8 are set by these funcs),

 * and (for boot & dump) should be sorted numerically in the order

 * the events occur.

 */

/* Print a boot progress message. */

void ppc64_boot_msg(unsigned int src, const char *msg);



static inline void log_error(char *buf, unsigned int err_type, int fatal)

static inline void log_error(char *buf, unsigned int err_type, int fatal)

{

{

	if (ppc_md.log_error)

	if (ppc_md.log_error)

arch/powerpc/kernel/setup_64.c

+0 −29
Original line number Original line Diff line number Diff line
@@ -665,8 +665,6 @@ static void __init emergency_stack_init(void) 
 */

 */

void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

{

	ppc64_boot_msg(0x12, "Setup Arch");



	*cmdline_p = boot_command_line;

	*cmdline_p = boot_command_line;





	/*

	/*
@@ -711,33 +709,6 @@ void __init setup_arch(char **cmdline_p) 
	if ((unsigned long)_stext & 0xffff)

	if ((unsigned long)_stext & 0xffff)

		panic("Kernelbase not 64K-aligned (0x%lx)!\n",

		panic("Kernelbase not 64K-aligned (0x%lx)!\n",

		      (unsigned long)_stext);

		      (unsigned long)_stext);



	ppc64_boot_msg(0x15, "Setup Done");

}





/* ToDo: do something useful if ppc_md is not yet setup. */

#define PPC64_LINUX_FUNCTION 0x0f000000

#define PPC64_IPL_MESSAGE 0xc0000000

#define PPC64_TERM_MESSAGE 0xb0000000



static void ppc64_do_msg(unsigned int src, const char *msg)

{

	if (ppc_md.progress) {

		char buf[128];



		sprintf(buf, "%08X\n", src);

		ppc_md.progress(buf, 0);

		snprintf(buf, 128, "%s", msg);

		ppc_md.progress(buf, 0);

	}

}



/* Print a boot progress message. */

void ppc64_boot_msg(unsigned int src, const char *msg)

{

	ppc64_do_msg(PPC64_LINUX_FUNCTION|PPC64_IPL_MESSAGE|src, msg);

	printk("[boot]%04x %s\n", src, msg);

}

}





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP