diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-loki | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-loki')
| -rw-r--r-- | arch/arm/mach-loki/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-loki/include/mach/vmalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-loki/include/mach/debug-macro.S b/arch/arm/mach-loki/include/mach/debug-macro.S index a8c20bd2f951..3136c913a92c 100644 --- a/arch/arm/mach-loki/include/mach/debug-macro.S +++ b/arch/arm/mach-loki/include/mach/debug-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <mach/loki.h> | 9 | #include <mach/loki.h> |
| 10 | 10 | ||
| 11 | .macro addruart,rx | 11 | .macro addruart, rx, tmp |
| 12 | mrc p15, 0, \rx, c1, c0 | 12 | mrc p15, 0, \rx, c1, c0 |
| 13 | tst \rx, #1 @ MMU enabled? | 13 | tst \rx, #1 @ MMU enabled? |
| 14 | ldreq \rx, =LOKI_REGS_PHYS_BASE | 14 | ldreq \rx, =LOKI_REGS_PHYS_BASE |
diff --git a/arch/arm/mach-loki/include/mach/vmalloc.h b/arch/arm/mach-loki/include/mach/vmalloc.h index 8dc3bfcbf9f0..5dcbd865443f 100644 --- a/arch/arm/mach-loki/include/mach/vmalloc.h +++ b/arch/arm/mach-loki/include/mach/vmalloc.h | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | * arch/arm/mach-loki/include/mach/vmalloc.h | 2 | * arch/arm/mach-loki/include/mach/vmalloc.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #define VMALLOC_END 0xfe800000 | 5 | #define VMALLOC_END 0xfe800000UL |