diff options
author | Márton Németh <nm127@freemail.hu> | 2010-03-06 17:43:55 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-19 01:38:16 -0400 |
commit | 09156a7a409cf93d1ca2706bf05d714879a5b7ea (patch) | |
tree | 086dd7c6ddd9973e702695cb73e1075b4b2f28b7 /arch | |
parent | 409d241b7bb2cf0278186040ace1c4704fb2a82f (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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 4 |
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 a7cf4934342c..725526547994 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
@@ -884,13 +884,17 @@ KernelSPE: | |||
884 | lwz r3,_MSR(r1) | 884 | lwz r3,_MSR(r1) |
885 | oris r3,r3,MSR_SPE@h | 885 | oris r3,r3,MSR_SPE@h |
886 | stw r3,_MSR(r1) /* enable use of SPE after return */ | 886 | stw r3,_MSR(r1) /* enable use of SPE after return */ |
887 | #ifdef CONFIG_PRINTK | ||
887 | lis r3,87f@h | 888 | lis r3,87f@h |
888 | ori r3,r3,87f@l | 889 | ori r3,r3,87f@l |
889 | mr r4,r2 /* current */ | 890 | mr r4,r2 /* current */ |
890 | lwz r5,_NIP(r1) | 891 | lwz r5,_NIP(r1) |
891 | bl printk | 892 | bl printk |
893 | #endif | ||
892 | b ret_from_except | 894 | b ret_from_except |
895 | #ifdef CONFIG_PRINTK | ||
893 | 87: .string "SPE used in kernel (task=%p, pc=%x) \n" | 896 | 87: .string "SPE used in kernel (task=%p, pc=%x) \n" |
897 | #endif | ||
894 | .align 4,0 | 898 | .align 4,0 |
895 | 899 | ||
896 | #endif /* CONFIG_SPE */ | 900 | #endif /* CONFIG_SPE */ |