From: Daniel Walker <dwalker@codeaurora.org>
To: linux-arm-msm@vger.kernel.org
Cc: linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Daniel Walker <dwalker@codeaurora.org>,
Jeremy Kerr <jeremy.kerr@canonical.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Jason Wang <jason77.wang@gmail.com>,
Tony Lindgren <tony@atomide.com>,
Nicolas Pitre <nico@fluxnic.net>,
Russell King - ARM Linux <linux@arm.linux.org.uk>
Subject: [PATCH] msm: fix debug-macro.S build failure
Date: Wed, 27 Oct 2010 14:58:08 -0700 [thread overview]
Message-ID: <1288216688-718-1-git-send-email-dwalker@codeaurora.org> (raw)
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@canonical.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Jason Wang <jason77.wang@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Daniel Walker <dwalker@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.
next reply other threads:[~2010-10-27 21:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 21:58 Daniel Walker [this message]
2010-10-27 22:14 ` [PATCH] msm: fix debug-macro.S build failure Russell King - ARM Linux
2010-10-27 22:25 ` [PATCH -v2] " Daniel Walker
2010-10-28 2:30 ` [PATCH] " Nicolas Pitre
2010-10-28 16:30 ` Daniel Walker
2010-10-28 16:35 ` Russell King - ARM Linux
2010-10-28 16:41 ` Daniel Walker
2010-10-28 17:46 ` Russell King - ARM Linux
2010-10-28 18:00 ` Daniel Walker
2010-10-28 18:24 ` Nicolas Pitre
2010-10-28 18:27 ` Daniel Walker
2010-10-28 18:29 ` Russell King - ARM Linux
2010-10-28 18:46 ` Nicolas Pitre
2010-10-28 18:40 ` Nicolas Pitre
2010-10-28 18:28 ` Russell King - ARM Linux
2010-10-28 18:43 ` Nicolas Pitre
2010-10-28 18:46 ` Russell King - ARM Linux
2010-10-29 3:03 ` Nicolas Pitre
2010-10-29 21:17 ` Daniel Walker
2010-10-29 22:14 ` Russell King - ARM Linux
2010-10-29 22:21 ` Daniel Walker
2010-10-29 22:28 ` Russell King - ARM Linux
2010-10-29 23:06 ` [PATCH -v3] " Daniel Walker
2010-10-29 22:17 ` [PATCH] " Nicolas Pitre
2010-10-29 22:32 ` Daniel Walker
2010-10-29 22:53 ` Nicolas Pitre
2010-10-29 23:07 ` Daniel Walker
2010-11-05 21:31 ` David Brown
2010-10-28 22:36 ` Rohit Vaswani
2010-10-29 2:26 ` Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288216688-718-1-git-send-email-dwalker@codeaurora.org \
--to=dwalker@codeaurora.org \
--cc=jason77.wang@gmail.com \
--cc=jeremy.kerr@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=nico@fluxnic.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).