From d98f100dc979f87296ec88b63a0d506aaf4cd2bd Mon Sep 17 00:00:00 2001
From: Joe Lawrence <joe.lawrence@redhat.com>
Date: Thu, 8 Dec 2022 12:31:17 -0500
Subject: [PATCH] v0.9.2 backport: MR!1281 ("create-diff-object: add support
for .return_sites section (x86)")
Content-type: text/plain
commit 33368a88cdf875b0edd02b0dfd3356a7e93b24db
Author: Jonathan Dobson <jdobson@redhat.com>
Date: Sat Jul 16 15:46:54 2022 -0600
create-diff-object: add support for .return_sites section (x86)
Conflicts:
kpatch-build/create-diff-object.c
- Manually apply patch to avoid diff context, v0.9.2 structure
special_section structure doesn't have .arch
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
---
kpatch-build/create-diff-object.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
index cee8adf333dc..c9afe33bbdae 100644
--- a/kpatch-build/create-diff-object.c
+++ b/kpatch-build/create-diff-object.c
@@ -1991,6 +1991,11 @@ static int altinstructions_group_size(struct kpatch_elf *kelf, int offset)
return size;
}
+static int return_sites_group_size(struct kpatch_elf *kelf, int offset)
+{
+ return 4;
+}
+
static int smp_locks_group_size(struct kpatch_elf *kelf, int offset)
{
return 4;
@@ -2103,6 +2108,11 @@ static struct special_section special_sections[] = {
.name = ".altinstructions",
.group_size = altinstructions_group_size,
},
+ {
+ .name = ".return_sites",
+ .group_size = return_sites_group_size,
+ },
+
#endif
#ifdef __powerpc64__
{
--
2.38.1