From: Rob Herring <r.herring@freescale.com>
Date: Wed, 28 Jan 2015 15:05:04 +0000 (+0100)
Subject: ARM: 8295/1: fix v7M build for !CONFIG_PRINTK
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ed46092518aaed9e5266f8dd87ac12bf18cfc8e8;p=deliverable%2Flinux.git

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

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