]> bbs.cooldavid.org Git - net-next-2.6.git/commit
msm: fix debug-macro.S build failure
authorDaniel Walker <dwalker@codeaurora.org>
Wed, 27 Oct 2010 22:25:59 +0000 (15:25 -0700)
committerDaniel Walker <dwalker@codeaurora.org>
Fri, 29 Oct 2010 22:56:04 +0000 (15:56 -0700)
commitbcd72c3e0aff4b68d648d37ece423f2ccaf95337
tree0ea156dfcd502436dc91c759396086a295bf71c0
parent6f9419619ef6de9d7781c1a312cf6099e5b44789
msm: fix debug-macro.S build failure

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 with
two caveats. First the API for the addruart macro was updated, and
the new addruart case now return 0xfff00000 so that a know IO mapping
is created instead of a random one.

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