diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /arch/arm/kernel/entry-armv.S | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index a511ec5b11a3..d9fb819bf7cc 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -47,6 +47,13 @@ | |||
| 47 | movne r0, sp | 47 | movne r0, sp |
| 48 | adrne lr, 1b | 48 | adrne lr, 1b |
| 49 | bne do_IPI | 49 | bne do_IPI |
| 50 | |||
| 51 | #ifdef CONFIG_LOCAL_TIMERS | ||
| 52 | test_for_ltirq r0, r6, r5, lr | ||
| 53 | movne r0, sp | ||
| 54 | adrne lr, 1b | ||
| 55 | bne do_local_timer | ||
| 56 | #endif | ||
| 50 | #endif | 57 | #endif |
| 51 | 58 | ||
| 52 | .endm | 59 | .endm |