blk-mq: really fix plug list flushing for nomerge queues

[linux-2.6-block.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 9dc499977924d6ec3b86dbd59533c2c7bd11b8c1..1f157adfdaf9e8926d5c0b48b252ced84c52d716 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -503,7 +503,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
        if (!new_len)
                return ret;
 
-       down_write(&current->mm->mmap_sem);
+       if (down_write_killable(&current->mm->mmap_sem))
+               return -EINTR;
 
        if (flags & MREMAP_FIXED) {
                ret = mremap_to(addr, old_len, new_addr, new_len,