diff options
| author |   Roland McGrath <roland@redhat.com> | 2008-04-28 17:30:37 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2008-05-14 22:31:33 +1000 |
| commit | 7a10174eeafe737f3ccfcece5bdff749c3b044e0 (patch) | |
| tree | 96d3139ed19153e3369683d6b71cd74852fd1ef5 /arch/ppc/kernel/entry.S | |
| parent | [POWERPC] Create modalias file in sysfs for of_platform bus (diff) | |
| download | linux-dev-7a10174eeafe737f3ccfcece5bdff749c3b044e0.tar.xz linux-dev-7a10174eeafe737f3ccfcece5bdff749c3b044e0.zip | |
[POWERPC] Define and use TLF_RESTORE_SIGMASK
Replace TIF_RESTORE_SIGMASK with TLF_RESTORE_SIGMASK and define
our own set_restore_sigmask() function. This saves the costly
SMP-safe set_bit operation, which we do not need for the sigmask
flag since TIF_SIGPENDING always has to be set too.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/ppc/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 5f3a5d068a5c..fcd830a292e2 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S @@ -647,7 +647,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,18 lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) + andi. r0,r9,_TIF_USER_WORK_MASK bne do_work restore_user: @@ -898,7 +898,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING + andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE |