mirror of
https://github.com/dynup/kpatch
synced 2024-12-18 19:34:30 +00:00
a48fb4a6f6
These patches cause the following error on ppc64le on both 7.7 and 7.6:
create-diff-object: ERROR: export.o: kpatch_no_sibling_calls_ppc64le: 3290: Found an unsupported sibling call at e_show()+0x100. Add __attribute__((optimize("-fno-optimize-sibling-calls"))) to e_show() definition.
Adding -fno-optimize-sibling-calls breaks build on x86_64, so limit it
to ppc64le only.
Signed-off-by: Artem Savkov <asavkov@redhat.com>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
|
|
index 27459a453bb8..2247255877be 100644
|
|
--- a/fs/nfsd/export.c
|
|
+++ b/fs/nfsd/export.c
|
|
@@ -1184,7 +1184,13 @@ static void exp_flags(struct seq_file *m, int flag, int fsid,
|
|
}
|
|
}
|
|
|
|
+extern char *kpatch_string(void);
|
|
+
|
|
+#ifdef CONFIG_PPC64
|
|
+static int __attribute__((optimize("-fno-optimize-sibling-calls"))) e_show(struct seq_file *m, void *p)
|
|
+#else
|
|
static int e_show(struct seq_file *m, void *p)
|
|
+#endif
|
|
{
|
|
struct cache_head *cp = p;
|
|
struct svc_export *exp = container_of(cp, struct svc_export, h);
|
|
@@ -1193,6 +1199,7 @@ static int e_show(struct seq_file *m, void *p)
|
|
if (p == SEQ_START_TOKEN) {
|
|
seq_puts(m, "# Version 1.1\n");
|
|
seq_puts(m, "# Path Client(Flags) # IPs\n");
|
|
+ seq_puts(m, kpatch_string());
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
|
|
index 592f64643491..21b87cb948c9 100644
|
|
--- a/net/netlink/af_netlink.c
|
|
+++ b/net/netlink/af_netlink.c
|
|
@@ -2568,4 +2568,9 @@ panic:
|
|
panic("netlink_init: Cannot allocate nl_table\n");
|
|
}
|
|
|
|
+char *kpatch_string(void)
|
|
+{
|
|
+ return "# kpatch\n";
|
|
+}
|
|
+
|
|
core_initcall(netlink_proto_init);
|