From e802887419b38d384b8bfd90485f66fd9cb6f5e4 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 14 Jan 2009 20:43:15 +0000 Subject: [PATCH] --- yaml --- r: 138435 b: refs/heads/master c: 33642d31d19c967b9739253912cdd48885509805 h: refs/heads/master i: 138433: 8f004eab6a2923d6fa343c7f2f67cfdcf6b93f01 138431: c3df475b850636a833f3e0a10917c251c0a64d60 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/machdep.h | 2 -- trunk/arch/powerpc/kernel/setup_64.c | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f65dc83aade2..b838313b0d36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ce14a315db866605e6ac0b17fb33d10d7e49ab4 +refs/heads/master: 33642d31d19c967b9739253912cdd48885509805 diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h index 2740c44ff717..6c34a0df82fd 100644 --- a/trunk/arch/powerpc/include/asm/machdep.h +++ b/trunk/arch/powerpc/include/asm/machdep.h @@ -327,8 +327,6 @@ extern void __devinit smp_generic_take_timebase(void); */ /* Print a boot progress message. */ void ppc64_boot_msg(unsigned int src, const char *msg); -/* Print a termination message (print only -- does not stop the kernel) */ -void ppc64_terminate_msg(unsigned int src, const char *msg); static inline void log_error(char *buf, unsigned int err_type, int fatal) { diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c index 2d34196bba8c..73e16e298e28 100644 --- a/trunk/arch/powerpc/kernel/setup_64.c +++ b/trunk/arch/powerpc/kernel/setup_64.c @@ -578,13 +578,6 @@ void ppc64_boot_msg(unsigned int src, const char *msg) printk("[boot]%04x %s\n", src, msg); } -/* Print a termination message (print only -- does not stop the kernel) */ -void ppc64_terminate_msg(unsigned int src, const char *msg) -{ - ppc64_do_msg(PPC64_LINUX_FUNCTION|PPC64_TERM_MESSAGE|src, msg); - printk("[terminate]%04x %s\n", src, msg); -} - void cpu_die(void) { if (ppc_md.cpu_die)