From bb62600ffd6e2ee4131836645489cec8d76b2790 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Mar 2017 20:41:08 +0000 Subject: [PATCH] ia64: fix module loading for gcc-5.4.0 Starting from gcc-5.4.0 gcc geperates MLX instructions in more cases to rever local symbols: https://gcc.gnu.org/bugzilla/60465 That caused ia64 module loader to choke on such instructions: fuse: invalid slot number 1 for IMM64 Linux kernel used to handle only case where relocation pointed to slot=2 instruction in the bundle. That limitation was fixed in 9c184a073bfd650cc791956d6ca79725bb682716 commit. See http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433 This change lifts the restriction from linux kernel module loader. Bug: https://bugs.gentoo.org/601014 Signed-off-by: Sergei Trofimovich --- arch/ia64/kernel/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 6ab0ae7d6535..d1d945c6bd05 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -153,7 +153,7 @@ slot (const struct insn *insn) static int apply_imm64 (struct module *mod, struct insn *insn, uint64_t val) { - if (slot(insn) != 2) { + if (slot(insn) != 1 && slot(insn) != 2) { printk(KERN_ERR "%s: invalid slot number %d for IMM64\n", mod->name, slot(insn)); return 0; @@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val) static int apply_imm60 (struct module *mod, struct insn *insn, uint64_t val) { - if (slot(insn) != 2) { + if (slot(insn) != 1 && slot(insn) != 2) { printk(KERN_ERR "%s: invalid slot number %d for IMM60\n", mod->name, slot(insn)); return 0; -- 2.12.0