xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus

Browse Source 
Conflicts:
	arch/arm/kernel/ptrace.c
This commit is contained in:
Russell King
2012-05-29 22:13:55 +01:00
parent ef0c14842e 70b58d896b
commit e94c805f0c
6 changed files with 32 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/kernel/entry-common.S
View File

@@ -53,9 +53,13 @@ fast_work_pending:
work_pending:
tst r1, #_TIF_NEED_RESCHED
bne work_resched
tst r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME
beq no_work_pending
/*
* TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
*/
ldr r2, [sp, #S_PSR]
mov r0, sp @ 'regs'
tst r2, #15 @ are we returning to user mode?
bne no_work_pending @ no? just leave, then...
mov r2, why @ 'syscall'
tst r1, #_TIF_SIGPENDING @ delivering a signal?
movne why, #0 @ prevent further restarts