diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/mach-gemini/include/mach/debug-macro.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/mach-gemini/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-gemini/include/mach/debug-macro.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S index ad477047069d..f40e006d296e 100644 --- a/arch/arm/mach-gemini/include/mach/debug-macro.S +++ b/arch/arm/mach-gemini/include/mach/debug-macro.S | |||
| @@ -11,11 +11,9 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <mach/hardware.h> | 12 | #include <mach/hardware.h> |
| 13 | 13 | ||
| 14 | .macro addruart, rx, tmp | 14 | .macro addruart, rp, rv |
| 15 | mrc p15, 0, \rx, c1, c0 | 15 | ldr \rp, =GEMINI_UART_BASE @ physical |
| 16 | tst \rx, #1 @ MMU enabled? | 16 | ldr \rv, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual |
| 17 | ldreq \rx, =GEMINI_UART_BASE @ physical | ||
| 18 | ldrne \rx, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual | ||
| 19 | .endm | 17 | .endm |
| 20 | 18 | ||
| 21 | #define UART_SHIFT 2 | 19 | #define UART_SHIFT 2 |