git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kasan, slub: fix more conflicts with CONFIG_SLAB_FREELIST_HARDENED
[sfrench/cifs-2.6.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index 29655fb47a2c4b2cf61e1c61e5b06d6f51e537a8..9f5e323e883e6f0921bf9cdbfb81c6cf698064a4 100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-1125,7
+1125,7
@@
static inline int wait_on_page_bit_common(wait_queue_head_t *q,
break;
}
- if (
unlikely(signal_pending_state(state, current)
)) {
+ if (
signal_pending_state(state, current
)) {
ret = -EINTR;
break;
}