diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sh/kernel/entry-common.S | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 718bd2356b34..5e0dd1933847 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -192,7 +192,7 @@ work_resched: | |||
| 192 | .align 2 | 192 | .align 2 |
| 193 | 1: .long schedule | 193 | 1: .long schedule |
| 194 | 2: .long do_notify_resume | 194 | 2: .long do_notify_resume |
| 195 | 3: .long restore_all | 195 | 3: .long resume_userspace |
| 196 | #ifdef CONFIG_TRACE_IRQFLAGS | 196 | #ifdef CONFIG_TRACE_IRQFLAGS |
| 197 | 4: .long trace_hardirqs_on | 197 | 4: .long trace_hardirqs_on |
| 198 | 5: .long trace_hardirqs_off | 198 | 5: .long trace_hardirqs_off |