diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:44 +0200 |
commit | b226f744d40b052ac126c4cb16c76f66e5185128 (patch) | |
tree | e86f5c059dde241472689cbe2d55429cd15b2d56 /arch/sh/kernel/entry-common.S | |
parent | d5b889f2ecec7849e851ddd31c34bdfb3482b5de (diff) | |
parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
download | kernel_samsung_smdk4412-b226f744d40b052ac126c4cb16c76f66e5185128.zip kernel_samsung_smdk4412-b226f744d40b052ac126c4cb16c76f66e5185128.tar.gz kernel_samsung_smdk4412-b226f744d40b052ac126c4cb16c76f66e5185128.tar.bz2 |
Merge branch 'linus' into perf/core
Merge reason: pick up tools/perf/ changes from upstream.
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 68d9223..3eb8493 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 |