git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
debug.S
diff --git
a/arch/arm/kernel/debug.S
b/arch/arm/kernel/debug.S
index
bcd66e0
..
204e216
100644
(file)
--- a/
arch/arm/kernel/debug.S
+++ b/
arch/arm/kernel/debug.S
@@
-22,7
+22,7
@@
#if defined(CONFIG_DEBUG_ICEDCC)
@@ debug using ARM EmbeddedICE DCC channel
#if defined(CONFIG_DEBUG_ICEDCC)
@@ debug using ARM EmbeddedICE DCC channel
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
.endm
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
.endm
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
@@
-106,7
+106,7
@@
#ifdef CONFIG_MMU
.macro addruart_current, rx, tmp1, tmp2
#ifdef CONFIG_MMU
.macro addruart_current, rx, tmp1, tmp2
- addruart \tmp1, \tmp2
+ addruart \tmp1, \tmp2
, \rx
mrc p15, 0, \rx, c1, c0
tst \rx, #1
moveq \rx, \tmp1
mrc p15, 0, \rx, c1, c0
tst \rx, #1
moveq \rx, \tmp1
@@
-151,6
+151,8
@@
printhex: adr r2, hexbuf
b printascii
ENDPROC(printhex2)
b printascii
ENDPROC(printhex2)
+hexbuf: .space 16
+
.ltorg
ENTRY(printascii)
.ltorg
ENTRY(printascii)
@@
-175,5
+177,3
@@
ENTRY(printch)
mov r0, #0
b 1b
ENDPROC(printch)
mov r0, #0
b 1b
ENDPROC(printch)
-
-hexbuf: .space 16