diff options
| -rw-r--r-- | arch/arc/kernel/entry.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S index 29b82adbf0b4..83a046a7cd06 100644 --- a/arch/arc/kernel/entry.S +++ b/arch/arc/kernel/entry.S | |||
| @@ -156,7 +156,7 @@ ARCFP_DATA int1_saved_reg | |||
| 156 | int1_saved_reg: | 156 | int1_saved_reg: |
| 157 | .zero 4 | 157 | .zero 4 |
| 158 | 158 | ||
| 159 | /* Each Interrupt level needs it's own scratch */ | 159 | /* Each Interrupt level needs its own scratch */ |
| 160 | #ifdef CONFIG_ARC_COMPACT_IRQ_LEVELS | 160 | #ifdef CONFIG_ARC_COMPACT_IRQ_LEVELS |
| 161 | 161 | ||
| 162 | ARCFP_DATA int2_saved_reg | 162 | ARCFP_DATA int2_saved_reg |
| @@ -473,7 +473,7 @@ trap_with_param: | |||
| 473 | lr r0, [efa] | 473 | lr r0, [efa] |
| 474 | mov r1, sp | 474 | mov r1, sp |
| 475 | 475 | ||
| 476 | ; Now that we have read EFA, its safe to do "fake" rtie | 476 | ; Now that we have read EFA, it is safe to do "fake" rtie |
| 477 | ; and get out of CPU exception mode | 477 | ; and get out of CPU exception mode |
| 478 | FAKE_RET_FROM_EXCPN r11 | 478 | FAKE_RET_FROM_EXCPN r11 |
| 479 | 479 | ||
| @@ -678,9 +678,9 @@ not_exception: | |||
| 678 | brne r9, event_IRQ2, 149f | 678 | brne r9, event_IRQ2, 149f |
| 679 | 679 | ||
| 680 | ;------------------------------------------------------------------ | 680 | ;------------------------------------------------------------------ |
| 681 | ; if L2 IRQ interrupted a L1 ISR, we'd disbaled preemption earlier | 681 | ; if L2 IRQ interrupted an L1 ISR, we'd disabled preemption earlier |
| 682 | ; so that sched doesnt move to new task, causing L1 to be delayed | 682 | ; so that sched doesn't move to new task, causing L1 to be delayed |
| 683 | ; undeterministically. Now that we've achieved that, lets reset | 683 | ; undeterministically. Now that we've achieved that, let's reset |
| 684 | ; things to what they were, before returning from L2 context | 684 | ; things to what they were, before returning from L2 context |
| 685 | ;---------------------------------------------------------------- | 685 | ;---------------------------------------------------------------- |
| 686 | 686 | ||
| @@ -736,7 +736,7 @@ ENTRY(ret_from_fork) | |||
| 736 | ; put last task in scheduler queue | 736 | ; put last task in scheduler queue |
| 737 | bl @schedule_tail | 737 | bl @schedule_tail |
| 738 | 738 | ||
| 739 | ; If kernel thread, jump to it's entry-point | 739 | ; If kernel thread, jump to its entry-point |
| 740 | ld r9, [sp, PT_status32] | 740 | ld r9, [sp, PT_status32] |
| 741 | brne r9, 0, 1f | 741 | brne r9, 0, 1f |
| 742 | 742 | ||
