diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 17:07:25 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 17:07:25 +1000 |
commit | 72f5b542fee805a5c1ac3a874b59b4bc494b1fb6 (patch) | |
tree | d4a9ff3a111407ed6d145cccb44a7f02963e98fb /mm/kasan/kasan.c | |
parent | b3857aacfa35f5097984626733a2d09eb6c3bcb3 (diff) | |
parent | a33297c95d6bce1713c6f0b3f8bdc8e8395d647f (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'mm/kasan/kasan.c')
-rw-r--r-- | mm/kasan/kasan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index e4c2975fcae8..c81549d5c833 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -691,7 +691,7 @@ int kasan_module_alloc(void *addr, size_t size) ret = __vmalloc_node_range(shadow_size, 1, shadow_start, shadow_start + shadow_size, - GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, + GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, __builtin_return_address(0)); |