diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-18 09:44:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-18 09:44:48 -0700 |
| commit | da56125cdc44c166968a493f12a47b9eb3a6ee98 (patch) | |
| tree | 5d371bfdc228807fadbef1ed94eed33fa481cf76 | |
| parent | 5b8d95d021bdae7cfc30530ea13b9ea3c10c23df (diff) | |
| parent | 7fa0962396d0d6dc0be6ef6bced61c951a0452cc (diff) | |
Merge "arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y"
| -rw-r--r-- | arch/arm64/kernel/module.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index 7f316982ce00..093c13541efb 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -32,11 +32,16 @@ void *module_alloc(unsigned long size) { + gfp_t gfp_mask = GFP_KERNEL; void *p; + /* Silence the initial allocation */ + if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS)) + gfp_mask |= __GFP_NOWARN; + p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base, module_alloc_base + MODULES_VSIZE, - GFP_KERNEL, PAGE_KERNEL_EXEC, 0, + gfp_mask, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, __builtin_return_address(0)); if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) && |