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 git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-orion5x/include/mach/debug-macro.S
b/arch/arm/mach-orion5x/include/mach/debug-macro.S
index
c7f808b
..
91e0e39
100644
(file)
--- a/
arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ b/
arch/arm/mach-orion5x/include/mach/debug-macro.S
@@
-10,7
+10,7
@@
#include <mach/orion5x.h>
#include <mach/orion5x.h>
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
ldreq \rx, =ORION5X_REGS_PHYS_BASE
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
ldreq \rx, =ORION5X_REGS_PHYS_BASE