Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / module.c

diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index f750bd7bd2c2d38db5e5d2aee8dfb61c4dfd517f..b89b59158b9592317479422b14cfb8e7779fa722 100644 (file)
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -50,7 +50,7 @@ void *module_alloc(unsigned long size)
        if (PAGE_ALIGN(size) > MODULES_LEN)
                return NULL;
        return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
-                                   GFP_KERNEL, PAGE_KERNEL, -1,
+                                   GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
                                    __builtin_return_address(0));
 }
 #endif
@@ -222,7 +222,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
        struct mod_arch_syminfo *info;
        Elf_Addr loc, val;
        int r_type, r_sym;
-       int rc;
+       int rc = -ENOEXEC;
 
        /* This is where to make the change */
        loc = base + rela->r_offset;