Patchwork powerpc: do not call prink when CONFIG_PRINTK is not defined

login
register
mail settings
Submitter Németh Márton
Date March 7, 2010, 8:43 a.m.
Message ID <4B93674B.4090708@freemail.hu>
Download mbox | patch
Permalink /patch/47067/
State Accepted
Headers show

Comments

Németh Márton - March 7, 2010, 8:43 a.m.
From: Márton Németh <nm127@freemail.hu>

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>
---

Patch

diff -upr linux-2.6.33.orig/arch/powerpc/kernel/head_fsl_booke.S linux/arch/powerpc/kernel/head_fsl_booke.S
--- linux-2.6.33.orig/arch/powerpc/kernel/head_fsl_booke.S	2010-02-24 19:52:17.000000000 +0100
+++ linux/arch/powerpc/kernel/head_fsl_booke.S	2010-03-07 09:28:05.000000000 +0100
@@ -887,13 +887,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 */