diff options
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/debug.S | 14 | ||||
-rw-r--r-- | arch/arm/kernel/smp_twd.c | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 66f711b2e0e8..6809200c31fb 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
@@ -100,6 +100,13 @@ ENTRY(printch) | |||
100 | b 1b | 100 | b 1b |
101 | ENDPROC(printch) | 101 | ENDPROC(printch) |
102 | 102 | ||
103 | ENTRY(debug_ll_addr) | ||
104 | addruart r2, r3, ip | ||
105 | str r2, [r0] | ||
106 | str r3, [r1] | ||
107 | mov pc, lr | ||
108 | ENDPROC(debug_ll_addr) | ||
109 | |||
103 | #else | 110 | #else |
104 | 111 | ||
105 | ENTRY(printascii) | 112 | ENTRY(printascii) |
@@ -119,4 +126,11 @@ ENTRY(printch) | |||
119 | mov pc, lr | 126 | mov pc, lr |
120 | ENDPROC(printch) | 127 | ENDPROC(printch) |
121 | 128 | ||
129 | ENTRY(debug_ll_addr) | ||
130 | mov r2, #0 | ||
131 | str r2, [r0] | ||
132 | str r2, [r1] | ||
133 | mov pc, lr | ||
134 | ENDPROC(debug_ll_addr) | ||
135 | |||
122 | #endif | 136 | #endif |
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index ff07879ad95d..49f335d301ba 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c | |||
@@ -390,10 +390,8 @@ void __init twd_local_timer_of_register(void) | |||
390 | int err; | 390 | int err; |
391 | 391 | ||
392 | np = of_find_matching_node(NULL, twd_of_match); | 392 | np = of_find_matching_node(NULL, twd_of_match); |
393 | if (!np) { | 393 | if (!np) |
394 | err = -ENODEV; | 394 | return; |
395 | goto out; | ||
396 | } | ||
397 | 395 | ||
398 | twd_ppi = irq_of_parse_and_map(np, 0); | 396 | twd_ppi = irq_of_parse_and_map(np, 0); |
399 | if (!twd_ppi) { | 397 | if (!twd_ppi) { |