diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
| commit | 7f36522fa5c8192dccee0f0a414f1b7b336b9c87 (patch) | |
| tree | 443ab002a359443792f43c48790e91539a01e4d4 /fs/file.c | |
| parent | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (diff) | |
| parent | 28415881a8fced951563443d0a95f9f14cea8687 (diff) | |
Merge branch 'akpm/master'
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 ad6f094f2eff..1c2972e3a405 100644 --- a/fs/file.c +++ b/fs/file.c @@ -42,7 +42,7 @@ static void *alloc_fdmem(size_t size) if (data != NULL) return data; } - return __vmalloc(size, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM, PAGE_KERNEL); + return __vmalloc(size, GFP_KERNEL_ACCOUNT, PAGE_KERNEL); } static void __free_fdtable(struct fdtable *fdt) |