linux/arch
Daniel Walker bcd72c3e0a msm: fix debug-macro.S build failure
Originally there was an ifdef case to handle when no debug uart
was selected. In commit 0ea1293009
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>
2010-10-29 15:56:04 -07:00
..
alpha alpha: use single HAE window on T2 core logic (gamma, sable) 2010-10-26 16:52:12 -07:00
arm msm: fix debug-macro.S build failure 2010-10-29 15:56:04 -07:00
avr32 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
blackfin m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
cris mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
frv mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
h8300 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
ia64 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
m32r mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
m68k m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2010-10-25 07:44:27 -07:00
microblaze mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
mips mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
mn10300 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
parisc mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
powerpc replace nested max/min macros with {max,min}3 macro 2010-10-26 16:52:12 -07:00
s390 mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
score mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
sh mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
sparc mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2010-10-26 17:25:38 -07:00
um um: migrate from __do_IRQ() to generic_handle_irq() 2010-10-26 16:52:12 -07:00
x86 Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 2010-10-26 18:20:19 -07:00
xtensa mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
.gitignore
Kconfig Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2010-09-24 09:12:05 +02:00