[PATCH] msm: fix debug-macro.S build failure
Daniel Walker
dwalker at codeaurora.org
Wed Oct 27 17:58:08 EDT 2010
Originally there was an ifdef case to handle when no debug uart
was selected. In commit 0ea1293009826da45e1019f45dfde1e557bb30df
that case was removed which causes the following build failure,
linux-2.6/arch/arm/kernel/debug.S: Assembler messages:
linux-2.6/arch/arm/kernel/debug.S:174: Error: bad instruction `addruart r1,r2'
linux-2.6/arch/arm/kernel/debug.S:176: Error: bad instruction `waituart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:177: Error: bad instruction `senduart r1,r3'
linux-2.6/arch/arm/kernel/debug.S:178: Error: bad instruction `busyuart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:190: Error: bad instruction `addruart r1,r2'
This is a partial revert to add back the case which was removed.
Cc: Jeremy Kerr <jeremy.kerr at canonical.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
Cc: Jason Wang <jason77.wang at gmail.com>
Cc: Tony Lindgren <tony at atomide.com>
Cc: Nicolas Pitre <nico at fluxnic.net>
Cc: Russell King - ARM Linux <linux at arm.linux.org.uk>
Signed-off-by: Daniel Walker <dwalker at codeaurora.org>
---
arch/arm/mach-msm/include/mach/debug-macro.S | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index fbd5d90..7796d8c 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -36,7 +36,16 @@
tst \rd, #0x04
beq 1001b
.endm
+#else
+ .macro addruart, rx, tmp
+ .endm
- .macro busyuart,rd,rx
+ .macro senduart,rd,rx
+ .endm
+
+ .macro waituart,rd,rx
.endm
#endif
+
+ .macro busyuart,rd,rx
+ .endm
--
1.7.0.4
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
More information about the linux-arm-kernel
mailing list