From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CF831382C5 for ; Sun, 25 Mar 2018 14:31:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54545E089E; Sun, 25 Mar 2018 14:31:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10144E089E for ; Sun, 25 Mar 2018 14:31:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECA0F335C5A for ; Sun, 25 Mar 2018 14:31:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43E4525B for ; Sun, 25 Mar 2018 14:31:02 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1521988217.1c20d8df3b3f682a2164e54c49f846eed016066f.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.9 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 1700_ia64-fix-module-loading-for-gcc-5.4.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 1c20d8df3b3f682a2164e54c49f846eed016066f X-VCS-Branch: 4.9 Date: Sun, 25 Mar 2018 14:31:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 621d03fd-07e3-4403-9fe5-28bc82c87af7 X-Archives-Hash: 8c99a4e09a1aa81f66a6da10e93675dd commit: 1c20d8df3b3f682a2164e54c49f846eed016066f Author: Mike Pagano gentoo org> AuthorDate: Sun Mar 25 14:30:17 2018 +0000 Commit: Mike Pagano gentoo org> CommitDate: Sun Mar 25 14:30:17 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=1c20d8df Remove redundant patch: 1700_ia64-fix-module-loading-for-gcc-5.4.patch 1700_ia64-fix-module-loading-for-gcc-5.4.patch | 66 -------------------------- 1 file changed, 66 deletions(-) diff --git a/1700_ia64-fix-module-loading-for-gcc-5.4.patch b/1700_ia64-fix-module-loading-for-gcc-5.4.patch deleted file mode 100644 index 54c4bca..0000000 --- a/1700_ia64-fix-module-loading-for-gcc-5.4.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a25fb8508c1b80dce742dbeaa4d75a1e9f2c5617 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 1 May 2017 11:51:55 -0700 -Subject: ia64: fix module loading for gcc-5.4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting from gcc-5.4+ gcc generates MLX instructions in more cases to -refer local symbols: - - https://gcc.gnu.org/PR60465 - -That caused ia64 module loader to choke on such instructions: - - fuse: invalid slot number 1 for IMM64 - -The Linux kernel used to handle only case where relocation pointed to -slot=2 instruction in the bundle. That limitation was fixed in linux by -commit 9c184a073bfd ("[IA64] Fix 2.6 kernel for the new ia64 assembler") -See - - http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433 - -This change lifts the slot=2 restriction from the kernel module loader. - -Tested on 'fuse' and 'btrfs' kernel modules. - -Cc: Markus Elfring -Cc: H J Lu -Cc: Fenghua Yu -Cc: Andrew Morton -Bug: https://bugs.gentoo.org/601014 -Tested-by: Émeric MASCHINO -Signed-off-by: Sergei Trofimovich -Signed-off-by: Tony Luck -Signed-off-by: Linus Torvalds ---- - 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 6ab0ae7..d1d945c 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; --- -cgit v1.1 -