diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:07:25 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:07:25 -0500 |
| commit | 186f93ea1f274f4cde4a356401c1786c818ff881 (patch) | |
| tree | de28f076c823d5423a5b4780f0d37554c242c982 /arch/arm/mach-realview/include/mach | |
| parent | 3560adf62075829393743667ff338dd8fd26a5c2 (diff) | |
| parent | 4e6d488af37980d224cbf298224db6173673f362 (diff) | |
Merge branch 'tmpreg' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/include/mach/debug-macro.S
Diffstat (limited to 'arch/arm/mach-realview/include/mach')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index 932d8af18062..86622289b74e 100644 --- a/arch/arm/mach-realview/include/mach/debug-macro.S +++ b/arch/arm/mach-realview/include/mach/debug-macro.S | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #error "Unknown RealView platform" | 33 | #error "Unknown RealView platform" |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | .macro addruart,rx | 36 | .macro addruart, rx, tmp |
| 37 | mrc p15, 0, \rx, c1, c0 | 37 | mrc p15, 0, \rx, c1, c0 |
| 38 | tst \rx, #1 @ MMU enabled? | 38 | tst \rx, #1 @ MMU enabled? |
| 39 | moveq \rx, #0x10000000 | 39 | moveq \rx, #0x10000000 |