diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
| commit | 2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb (patch) | |
| tree | 4b3bb0f76c15264fe7d4cced91127f3d96ff31f5 /arch/arm/kernel/debug.S | |
| parent | 9cb543124a2d31af42ce61a4c30765ecc8e5f1fa (diff) | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 6809200c31fb..14f7c3b14632 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -100,12 +100,14 @@ ENTRY(printch) | |||
| 100 | b 1b | 100 | b 1b |
| 101 | ENDPROC(printch) | 101 | ENDPROC(printch) |
| 102 | 102 | ||
| 103 | #ifdef CONFIG_MMU | ||
| 103 | ENTRY(debug_ll_addr) | 104 | ENTRY(debug_ll_addr) |
| 104 | addruart r2, r3, ip | 105 | addruart r2, r3, ip |
| 105 | str r2, [r0] | 106 | str r2, [r0] |
| 106 | str r3, [r1] | 107 | str r3, [r1] |
| 107 | mov pc, lr | 108 | mov pc, lr |
| 108 | ENDPROC(debug_ll_addr) | 109 | ENDPROC(debug_ll_addr) |
| 110 | #endif | ||
| 109 | 111 | ||
| 110 | #else | 112 | #else |
| 111 | 113 | ||