diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /arch/sh/kernel/entry-common.S | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.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 |