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.)
105 lines
3.3 KiB
Diff
105 lines
3.3 KiB
Diff
From 90e4b4c6300522c4494664bc95285cb94e137b17 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Marchand <jmarchan@redhat.com>
|
|
Date: Mon, 1 Jun 2026 15:21:58 +0200
|
|
Subject: [PATCH] scripts/sorttable: Remove unused macro defines
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-180193
|
|
|
|
commit 28b24394c6e9a3166fcb4480cba054562526657c
|
|
Author: Steven Rostedt <rostedt@goodmis.org>
|
|
Date: Sun Jan 5 11:22:12 2025 -0500
|
|
|
|
scripts/sorttable: Remove unused macro defines
|
|
|
|
The code of sorttable.h was copied from the recordmcount.h which defined
|
|
a bunch of Elf MACROs so that they could be used between 32bit and 64bit
|
|
functions. But there's several MACROs that sorttable.h does not use but
|
|
was copied over. Remove them to clean up the code.
|
|
|
|
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.128870118@goodmis.org
|
|
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
|
|
|
|
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
|
|
|
|
diff --git a/scripts/sorttable.h b/scripts/sorttable.h
|
|
index a7c5445baf00..14d0c4d843e8 100644
|
|
--- a/scripts/sorttable.h
|
|
+++ b/scripts/sorttable.h
|
|
@@ -27,19 +27,10 @@
|
|
#undef Elf_Ehdr
|
|
#undef Elf_Shdr
|
|
#undef Elf_Rel
|
|
-#undef Elf_Rela
|
|
#undef Elf_Sym
|
|
-#undef ELF_R_SYM
|
|
-#undef Elf_r_sym
|
|
-#undef ELF_R_INFO
|
|
-#undef Elf_r_info
|
|
-#undef ELF_ST_BIND
|
|
#undef ELF_ST_TYPE
|
|
-#undef fn_ELF_R_SYM
|
|
-#undef fn_ELF_R_INFO
|
|
#undef uint_t
|
|
#undef _r
|
|
-#undef _w
|
|
|
|
#ifdef SORTTABLE_64
|
|
# define extable_ent_size 16
|
|
@@ -52,19 +43,10 @@
|
|
# define Elf_Ehdr Elf64_Ehdr
|
|
# define Elf_Shdr Elf64_Shdr
|
|
# define Elf_Rel Elf64_Rel
|
|
-# define Elf_Rela Elf64_Rela
|
|
# define Elf_Sym Elf64_Sym
|
|
-# define ELF_R_SYM ELF64_R_SYM
|
|
-# define Elf_r_sym Elf64_r_sym
|
|
-# define ELF_R_INFO ELF64_R_INFO
|
|
-# define Elf_r_info Elf64_r_info
|
|
-# define ELF_ST_BIND ELF64_ST_BIND
|
|
# define ELF_ST_TYPE ELF64_ST_TYPE
|
|
-# define fn_ELF_R_SYM fn_ELF64_R_SYM
|
|
-# define fn_ELF_R_INFO fn_ELF64_R_INFO
|
|
# define uint_t uint64_t
|
|
# define _r r8
|
|
-# define _w w8
|
|
#else
|
|
# define extable_ent_size 8
|
|
# define compare_extable compare_extable_32
|
|
@@ -76,19 +58,10 @@
|
|
# define Elf_Ehdr Elf32_Ehdr
|
|
# define Elf_Shdr Elf32_Shdr
|
|
# define Elf_Rel Elf32_Rel
|
|
-# define Elf_Rela Elf32_Rela
|
|
# define Elf_Sym Elf32_Sym
|
|
-# define ELF_R_SYM ELF32_R_SYM
|
|
-# define Elf_r_sym Elf32_r_sym
|
|
-# define ELF_R_INFO ELF32_R_INFO
|
|
-# define Elf_r_info Elf32_r_info
|
|
-# define ELF_ST_BIND ELF32_ST_BIND
|
|
# define ELF_ST_TYPE ELF32_ST_TYPE
|
|
-# define fn_ELF_R_SYM fn_ELF32_R_SYM
|
|
-# define fn_ELF_R_INFO fn_ELF32_R_INFO
|
|
# define uint_t uint32_t
|
|
# define _r r
|
|
-# define _w w
|
|
#endif
|
|
|
|
#if defined(SORTTABLE_64) && defined(UNWINDER_ORC_ENABLED)
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|