diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
| commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
| tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /arch/parisc/kernel/module.c | |
| parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
| parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'arch/parisc/kernel/module.c')
| -rw-r--r-- | arch/parisc/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index 50dfafc3f2c1..0d498efddab2 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -219,7 +219,7 @@ void *module_alloc(unsigned long size) * init_data correctly */ return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, GFP_KERNEL | __GFP_HIGHMEM, - PAGE_KERNEL_RWX, NUMA_NO_NODE, + PAGE_KERNEL_RWX, 0, NUMA_NO_NODE, __builtin_return_address(0)); } |