aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2010-03-06 22:43:55 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-03-19 16:38:16 +1100
commit09156a7a409cf93d1ca2706bf05d714879a5b7ea (patch)
tree086dd7c6ddd9973e702695cb73e1075b4b2f28b7
parent409d241b7bb2cf0278186040ace1c4704fb2a82f (diff)
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 <nm127@freemail.hu> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index a7cf4934342..72552654799 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 */