Andrew Lukoshko
0eab958d1f
Add the RHEL 211.21.1..211.22.1 backports (1288-1351) from centos-stream-10 and upstream stable, on top of 211.20.1. Bump pkgrelease and specrelease to 211.22.1. (The redhat/ automotive rebuild-changelog tooling change is omitted: it patches redhat/scripts not present in this build base and does not affect the kernel.)
103 lines
3.0 KiB
Diff
103 lines
3.0 KiB
Diff
From 3e1ec2703946dbf8d8f658865fc5c601e3a2cdea Mon Sep 17 00:00:00 2001
|
|
From: Jerome Marchand <jmarchan@redhat.com>
|
|
Date: Mon, 1 Jun 2026 15:22:02 +0200
|
|
Subject: [PATCH] scripts/sorttable: Remove unused write functions
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-180193
|
|
|
|
commit 4f48a28b37d594dab38092514a42ae9f4b781553
|
|
Author: Steven Rostedt <rostedt@goodmis.org>
|
|
Date: Sun Jan 5 11:22:13 2025 -0500
|
|
|
|
scripts/sorttable: Remove unused write functions
|
|
|
|
The code of sorttable.h was copied from the recordmcount.h which defined
|
|
various write functions for different sizes (2, 4, 8 byte lengths). But
|
|
sorttable only uses the 4 byte writes. Remove the extra versions as they
|
|
are not used.
|
|
|
|
Cc: bpf <bpf@vger.kernel.org>
|
|
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Masahiro Yamada <masahiroy@kernel.org>
|
|
Cc: Nathan Chancellor <nathan@kernel.org>
|
|
Cc: Nicolas Schier <nicolas@fjasle.eu>
|
|
Cc: Zheng Yejian <zhengyejian1@huawei.com>
|
|
Cc: Martin Kelly <martin.kelly@crowdstrike.com>
|
|
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
|
|
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
Link: https://lore.kernel.org/20250105162344.314385504@goodmis.org
|
|
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
|
|
|
|
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
|
|
|
|
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
|
|
index 83cdb843d92f..4dcdbf7a5e26 100644
|
|
--- a/scripts/sorttable.c
|
|
+++ b/scripts/sorttable.c
|
|
@@ -68,8 +68,6 @@ static uint32_t (*r)(const uint32_t *);
|
|
static uint16_t (*r2)(const uint16_t *);
|
|
static uint64_t (*r8)(const uint64_t *);
|
|
static void (*w)(uint32_t, uint32_t *);
|
|
-static void (*w2)(uint16_t, uint16_t *);
|
|
-static void (*w8)(uint64_t, uint64_t *);
|
|
typedef void (*table_sort_t)(char *, int);
|
|
|
|
/*
|
|
@@ -146,31 +144,11 @@ static void wbe(uint32_t val, uint32_t *x)
|
|
put_unaligned_be32(val, x);
|
|
}
|
|
|
|
-static void w2be(uint16_t val, uint16_t *x)
|
|
-{
|
|
- put_unaligned_be16(val, x);
|
|
-}
|
|
-
|
|
-static void w8be(uint64_t val, uint64_t *x)
|
|
-{
|
|
- put_unaligned_be64(val, x);
|
|
-}
|
|
-
|
|
static void wle(uint32_t val, uint32_t *x)
|
|
{
|
|
put_unaligned_le32(val, x);
|
|
}
|
|
|
|
-static void w2le(uint16_t val, uint16_t *x)
|
|
-{
|
|
- put_unaligned_le16(val, x);
|
|
-}
|
|
-
|
|
-static void w8le(uint64_t val, uint64_t *x)
|
|
-{
|
|
- put_unaligned_le64(val, x);
|
|
-}
|
|
-
|
|
/*
|
|
* Move reserved section indices SHN_LORESERVE..SHN_HIRESERVE out of
|
|
* the way to -256..-1, to avoid conflicting with real section
|
|
@@ -277,16 +255,12 @@ static int do_file(char const *const fname, void *addr)
|
|
r2 = r2le;
|
|
r8 = r8le;
|
|
w = wle;
|
|
- w2 = w2le;
|
|
- w8 = w8le;
|
|
break;
|
|
case ELFDATA2MSB:
|
|
r = rbe;
|
|
r2 = r2be;
|
|
r8 = r8be;
|
|
w = wbe;
|
|
- w2 = w2be;
|
|
- w8 = w8be;
|
|
break;
|
|
default:
|
|
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|