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