diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-14 15:53:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-14 15:53:08 +0900 |
| commit | b195e46677bed5f044bc2eede65fd41c886ef5b2 (patch) | |
| tree | 38c04c153d05171919bc95deb82ceb1e6b9bcd77 /arch/sh/kernel/entry-common.S | |
| parent | d780613acc0eeea89e1b3a7d9db765e0f2a4a950 (diff) | |
| parent | 457b646189e47f9d48588809da3e806ec363f219 (diff) | |
| download | linux-stable-b195e46677bed5f044bc2eede65fd41c886ef5b2.tar.gz linux-stable-b195e46677bed5f044bc2eede65fd41c886ef5b2.tar.bz2 linux-stable-b195e46677bed5f044bc2eede65fd41c886ef5b2.zip | |
Merge branch 'sh/stable-updates'
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 68d9223b145e..3eb84931d2aa 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -121,7 +121,7 @@ noresched: ENTRY(resume_userspace) ! r8: current_thread_info cli - TRACE_IRQS_OfF + TRACE_IRQS_OFF mov.l @(TI_FLAGS,r8), r0 ! current_thread_info->flags tst #(_TIF_WORK_MASK & 0xff), r0 bt/s __restore_all |