summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRob Herring <r.herring@freescale.com>2015-01-28 16:05:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-01-29 15:23:12 +0000
commited46092518aaed9e5266f8dd87ac12bf18cfc8e8 (patch)
treea525d3539ba6c879dab4692cac57b9a5f9b04146 /arch/arm
parentc2607f74aad96d18316a6e709b40e0ffe9def148 (diff)
downloadlinux-ed46092518aaed9e5266f8dd87ac12bf18cfc8e8.tar.bz2
ARM: 8295/1: fix v7M build for !CONFIG_PRINTK
Minimal builds for v7M are broken when printk is disabled. The caller is assembly so add the necessary ifdef around the call. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/entry-v7m.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S
index 2260f1855820..8944f4991c3c 100644
--- a/arch/arm/kernel/entry-v7m.S
+++ b/arch/arm/kernel/entry-v7m.S
@@ -22,10 +22,12 @@
__invalid_entry:
v7m_exception_entry
+#ifdef CONFIG_PRINTK
adr r0, strerr
mrs r1, ipsr
mov r2, lr
bl printk
+#endif
mov r0, sp
bl show_regs
1: b 1b