From: Márton Németh Date: Sat, 6 Mar 2010 22:43:55 +0000 (+0000) Subject: powerpc: Do not call prink when CONFIG_PRINTK is not defined X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=09156a7a409cf93d1ca2706bf05d714879a5b7ea;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git powerpc: Do not call prink when CONFIG_PRINTK is not defined When printk() is disabled (CONFIG_PRINTK) at menu item General setup -> Configure standard kernel features (for small systems) -> Enable support for printk then there should be no printk() calls at all. Signed-off-by: Márton Németh Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index a7cf4934342c..725526547994 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -884,13 +884,17 @@ KernelSPE: lwz r3,_MSR(r1) oris r3,r3,MSR_SPE@h stw r3,_MSR(r1) /* enable use of SPE after return */ +#ifdef CONFIG_PRINTK lis r3,87f@h ori r3,r3,87f@l mr r4,r2 /* current */ lwz r5,_NIP(r1) bl printk +#endif b ret_from_except +#ifdef CONFIG_PRINTK 87: .string "SPE used in kernel (task=%p, pc=%x) \n" +#endif .align 4,0 #endif /* CONFIG_SPE */