projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: tegra: Stop setting pcibios_min_mem
[cascardo/linux.git]
/
mm
/
madvise.c
diff --git
a/mm/madvise.c
b/mm/madvise.c
index
07427d3
..
93fb63e
100644
(file)
--- a/
mm/madvise.c
+++ b/
mm/madvise.c
@@
-707,10
+707,12
@@
SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
return error;
write = madvise_need_mmap_write(behavior);
return error;
write = madvise_need_mmap_write(behavior);
- if (write)
- down_write(¤t->mm->mmap_sem);
- else
+ if (write) {
+ if (down_write_killable(¤t->mm->mmap_sem))
+ return -EINTR;
+ } else {
down_read(¤t->mm->mmap_sem);
down_read(¤t->mm->mmap_sem);
+ }
/*
* If the interval [start,end) covers some unmapped address
/*
* If the interval [start,end) covers some unmapped address