Commit 75d24d96 authored by Florian Fainelli's avatar Florian Fainelli Committed by Catalin Marinas

ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y

When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the
module space fails, because the module is too big, and then the module
allocation is attempted from vmalloc space. Silence the first allocation
failure in that case by setting __GFP_NOWARN.
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 03497d76
...@@ -40,8 +40,15 @@ ...@@ -40,8 +40,15 @@
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
void *module_alloc(unsigned long size) void *module_alloc(unsigned long size)
{ {
void *p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, gfp_t gfp_mask = GFP_KERNEL;
GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, void *p;
/* Silence the initial allocation */
if (IS_ENABLED(CONFIG_ARM_MODULE_PLTS))
gfp_mask |= __GFP_NOWARN;
p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
gfp_mask, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
__builtin_return_address(0)); __builtin_return_address(0));
if (!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || p) if (!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || p)
return p; return p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment