git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-shark
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-shark/include/mach/debug-macro.S
b/arch/arm/mach-shark/include/mach/debug-macro.S
index f97a7626bd587d39884e160e0877be571382e5f2..5ea24d4d1ba6e176985b16076b48412952de9aec 100644
(file)
--- a/
arch/arm/mach-shark/include/mach/debug-macro.S
+++ b/
arch/arm/mach-shark/include/mach/debug-macro.S
@@
-11,7
+11,7
@@
*
*/
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
mov \rx, #0xe0000000
orr \rx, \rx, #0x000003f8
.endm
@@
-20,6
+20,9
@@
strb \rd, [\rx]
.endm
+ .macro waituart,rd,rx
+ .endm
+
.macro busyuart,rd,rx
mov \rd, #0
1001: add \rd, \rd, #1