git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
entry.S
diff --git
a/arch/parisc/kernel/entry.S
b/arch/parisc/kernel/entry.S
index
e552e54
..
8c4712b
100644
(file)
--- a/
arch/parisc/kernel/entry.S
+++ b/
arch/parisc/kernel/entry.S
@@
-948,7
+948,7
@@
intr_check_sig:
/* As above */
mfctl %cr30,%r1
LDREG TI_FLAGS(%r1),%r19
/* As above */
mfctl %cr30,%r1
LDREG TI_FLAGS(%r1),%r19
- ldi (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %r20
+ ldi (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK
|_TIF_NOTIFY_RESUME
), %r20
and,COND(<>) %r19, %r20, %r0
b,n intr_restore /* skip past if we've nothing to do */
and,COND(<>) %r19, %r20, %r0
b,n intr_restore /* skip past if we've nothing to do */