diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2014-03-03 06:42:33 +0800 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2014-03-03 06:42:33 +0800 |
| commit | de4c0af15b38d383e79555be2d72e7958f1c0756 (patch) | |
| tree | a2f299215c432fdf00354a1307e22f7b8b8c4e40 /fs/file.c | |
| parent | 77fe582038582f6aa29a8e76ed319e05a69286e0 (diff) | |
| parent | 61dde96f97bb5b1ed4c11caf9a857d55ad8f6e17 (diff) | |
Merge tag 'v3.10.32' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.32-final
This is the 3.10.32 stable release
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index 4a78f981557a..9de20265a78c 100644 --- a/fs/file.c +++ b/fs/file.c @@ -34,7 +34,7 @@ static void *alloc_fdmem(size_t size) * vmalloc() if the allocation size will be considered "large" by the VM. */ if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { - void *data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN); + void *data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY); if (data != NULL) return data; } |