projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-block.git]
/
mm
/
gup.c
diff --git
a/mm/gup.c
b/mm/gup.c
index 6f591ccb8eca74282049fdefaadcd0c9dacb1e71..05acd7e2eb22e0849c5125d0cabc671fdc58f71f 100644
(file)
--- a/
mm/gup.c
+++ b/
mm/gup.c
@@
-727,7
+727,7
@@
retry:
* If we have a pending SIGKILL, don't keep faulting pages and
* potentially allocating memory.
*/
- if (
unlikely(fatal_signal_pending(current)
)) {
+ if (
fatal_signal_pending(current
)) {
ret = -ERESTARTSYS;
goto out;
}