Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.9 commit in: /
Date: Sun, 25 Mar 2018 14:31:06
Message-Id: 1521988217.1c20d8df3b3f682a2164e54c49f846eed016066f.mpagano@gentoo
1 commit: 1c20d8df3b3f682a2164e54c49f846eed016066f
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 25 14:30:17 2018 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 25 14:30:17 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=1c20d8df
7
8 Remove redundant patch: 1700_ia64-fix-module-loading-for-gcc-5.4.patch
9
10 1700_ia64-fix-module-loading-for-gcc-5.4.patch | 66 --------------------------
11 1 file changed, 66 deletions(-)
12
13 diff --git a/1700_ia64-fix-module-loading-for-gcc-5.4.patch b/1700_ia64-fix-module-loading-for-gcc-5.4.patch
14 deleted file mode 100644
15 index 54c4bca..0000000
16 --- a/1700_ia64-fix-module-loading-for-gcc-5.4.patch
17 +++ /dev/null
18 @@ -1,66 +0,0 @@
19 -From a25fb8508c1b80dce742dbeaa4d75a1e9f2c5617 Mon Sep 17 00:00:00 2001
20 -From: Sergei Trofimovich <slyfox@g.o>
21 -Date: Mon, 1 May 2017 11:51:55 -0700
22 -Subject: ia64: fix module loading for gcc-5.4
23 -MIME-Version: 1.0
24 -Content-Type: text/plain; charset=UTF-8
25 -Content-Transfer-Encoding: 8bit
26 -
27 -Starting from gcc-5.4+ gcc generates MLX instructions in more cases to
28 -refer local symbols:
29 -
30 - https://gcc.gnu.org/PR60465
31 -
32 -That caused ia64 module loader to choke on such instructions:
33 -
34 - fuse: invalid slot number 1 for IMM64
35 -
36 -The Linux kernel used to handle only case where relocation pointed to
37 -slot=2 instruction in the bundle. That limitation was fixed in linux by
38 -commit 9c184a073bfd ("[IA64] Fix 2.6 kernel for the new ia64 assembler")
39 -See
40 -
41 - http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433
42 -
43 -This change lifts the slot=2 restriction from the kernel module loader.
44 -
45 -Tested on 'fuse' and 'btrfs' kernel modules.
46 -
47 -Cc: Markus Elfring <elfring@×××××××××××××××××.net>
48 -Cc: H J Lu <hjl.tools@×××××.com>
49 -Cc: Fenghua Yu <fenghua.yu@×××××.com>
50 -Cc: Andrew Morton <akpm@××××××××××××××××.org>
51 -Bug: https://bugs.gentoo.org/601014
52 -Tested-by: Émeric MASCHINO <emeric.maschino@×××××.com>
53 -Signed-off-by: Sergei Trofimovich <slyfox@g.o>
54 -Signed-off-by: Tony Luck <tony.luck@×××××.com>
55 -Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org>
56 ----
57 - arch/ia64/kernel/module.c | 4 ++--
58 - 1 file changed, 2 insertions(+), 2 deletions(-)
59 -
60 -diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
61 -index 6ab0ae7..d1d945c 100644
62 ---- a/arch/ia64/kernel/module.c
63 -+++ b/arch/ia64/kernel/module.c
64 -@@ -153,7 +153,7 @@ slot (const struct insn *insn)
65 - static int
66 - apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
67 - {
68 -- if (slot(insn) != 2) {
69 -+ if (slot(insn) != 1 && slot(insn) != 2) {
70 - printk(KERN_ERR "%s: invalid slot number %d for IMM64\n",
71 - mod->name, slot(insn));
72 - return 0;
73 -@@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
74 - static int
75 - apply_imm60 (struct module *mod, struct insn *insn, uint64_t val)
76 - {
77 -- if (slot(insn) != 2) {
78 -+ if (slot(insn) != 1 && slot(insn) != 2) {
79 - printk(KERN_ERR "%s: invalid slot number %d for IMM60\n",
80 - mod->name, slot(insn));
81 - return 0;
82 ---
83 -cgit v1.1
84 -