From: Greg Kroah-Hartman Date: Wed, 28 May 2025 08:50:58 +0000 (+0200) Subject: drop queue-6.14/s390-crash-use-note-name-macros.patch X-Git-Tag: v6.12.31~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7607e1888139d81e9b90f34999568f3c48fac83a;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.14/s390-crash-use-note-name-macros.patch Breaks the build --- diff --git a/queue-6.14/s390-crash-use-note-name-macros.patch b/queue-6.14/s390-crash-use-note-name-macros.patch deleted file mode 100644 index e7310cd5bb..0000000000 --- a/queue-6.14/s390-crash-use-note-name-macros.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 76eb1508bbf45ef15ff2ffdce7a82c1f0ccb1621 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 15 Jan 2025 14:48:02 +0900 -Subject: s390/crash: Use note name macros - -From: Akihiko Odaki - -[ Upstream commit d4a760fb77fdac07efa3da4fa4a18f49f178d048 ] - -Use note name macros to match with the userspace's expectation. - -Signed-off-by: Akihiko Odaki -Acked-by: Heiko Carstens -Reviewed-by: Dave Martin -Link: https://lore.kernel.org/r/20250115-elf-v5-5-0f9e55bbb2fc@daynix.com -Signed-off-by: Kees Cook -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/crash_dump.c | 62 +++++++++++++---------------------- - 1 file changed, 23 insertions(+), 39 deletions(-) - -diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c -index 276cb4c1e11be..4a981266b4833 100644 ---- a/arch/s390/kernel/crash_dump.c -+++ b/arch/s390/kernel/crash_dump.c -@@ -246,15 +246,6 @@ bool is_kdump_kernel(void) - } - EXPORT_SYMBOL_GPL(is_kdump_kernel); - --static const char *nt_name(Elf64_Word type) --{ -- const char *name = "LINUX"; -- -- if (type == NT_PRPSINFO || type == NT_PRSTATUS || type == NT_PRFPREG) -- name = KEXEC_CORE_NOTE_NAME; -- return name; --} -- - /* - * Initialize ELF note - */ -@@ -279,10 +270,8 @@ static void *nt_init_name(void *buf, Elf64_Word type, void *desc, int d_len, - return PTR_ADD(buf, len); - } - --static inline void *nt_init(void *buf, Elf64_Word type, void *desc, int d_len) --{ -- return nt_init_name(buf, type, desc, d_len, nt_name(type)); --} -+#define nt_init(buf, type, desc) \ -+ nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) - - /* - * Calculate the size of ELF note -@@ -298,10 +287,7 @@ static size_t nt_size_name(int d_len, const char *name) - return size; - } - --static inline size_t nt_size(Elf64_Word type, int d_len) --{ -- return nt_size_name(d_len, nt_name(type)); --} -+#define nt_size(type, desc) nt_size_name(sizeof(desc), NN_ ## type) - - /* - * Fill ELF notes for one CPU with save area registers -@@ -322,18 +308,16 @@ static void *fill_cpu_elf_notes(void *ptr, int cpu, struct save_area *sa) - memcpy(&nt_fpregset.fpc, &sa->fpc, sizeof(sa->fpc)); - memcpy(&nt_fpregset.fprs, &sa->fprs, sizeof(sa->fprs)); - /* Create ELF notes for the CPU */ -- ptr = nt_init(ptr, NT_PRSTATUS, &nt_prstatus, sizeof(nt_prstatus)); -- ptr = nt_init(ptr, NT_PRFPREG, &nt_fpregset, sizeof(nt_fpregset)); -- ptr = nt_init(ptr, NT_S390_TIMER, &sa->timer, sizeof(sa->timer)); -- ptr = nt_init(ptr, NT_S390_TODCMP, &sa->todcmp, sizeof(sa->todcmp)); -- ptr = nt_init(ptr, NT_S390_TODPREG, &sa->todpreg, sizeof(sa->todpreg)); -- ptr = nt_init(ptr, NT_S390_CTRS, &sa->ctrs, sizeof(sa->ctrs)); -- ptr = nt_init(ptr, NT_S390_PREFIX, &sa->prefix, sizeof(sa->prefix)); -+ ptr = nt_init(ptr, PRSTATUS, nt_prstatus); -+ ptr = nt_init(ptr, PRFPREG, nt_fpregset); -+ ptr = nt_init(ptr, S390_TIMER, sa->timer); -+ ptr = nt_init(ptr, S390_TODCMP, sa->todcmp); -+ ptr = nt_init(ptr, S390_TODPREG, sa->todpreg); -+ ptr = nt_init(ptr, S390_CTRS, sa->ctrs); -+ ptr = nt_init(ptr, S390_PREFIX, sa->prefix); - if (cpu_has_vx()) { -- ptr = nt_init(ptr, NT_S390_VXRS_HIGH, -- &sa->vxrs_high, sizeof(sa->vxrs_high)); -- ptr = nt_init(ptr, NT_S390_VXRS_LOW, -- &sa->vxrs_low, sizeof(sa->vxrs_low)); -+ ptr = nt_init(ptr, S390_VXRS_HIGH, sa->vxrs_high); -+ ptr = nt_init(ptr, S390_VXRS_LOW, sa->vxrs_low); - } - return ptr; - } -@@ -346,16 +330,16 @@ static size_t get_cpu_elf_notes_size(void) - struct save_area *sa = NULL; - size_t size; - -- size = nt_size(NT_PRSTATUS, sizeof(struct elf_prstatus)); -- size += nt_size(NT_PRFPREG, sizeof(elf_fpregset_t)); -- size += nt_size(NT_S390_TIMER, sizeof(sa->timer)); -- size += nt_size(NT_S390_TODCMP, sizeof(sa->todcmp)); -- size += nt_size(NT_S390_TODPREG, sizeof(sa->todpreg)); -- size += nt_size(NT_S390_CTRS, sizeof(sa->ctrs)); -- size += nt_size(NT_S390_PREFIX, sizeof(sa->prefix)); -+ size = nt_size(PRSTATUS, struct elf_prstatus); -+ size += nt_size(PRFPREG, elf_fpregset_t); -+ size += nt_size(S390_TIMER, sa->timer); -+ size += nt_size(S390_TODCMP, sa->todcmp); -+ size += nt_size(S390_TODPREG, sa->todpreg); -+ size += nt_size(S390_CTRS, sa->ctrs); -+ size += nt_size(S390_PREFIX, sa->prefix); - if (cpu_has_vx()) { -- size += nt_size(NT_S390_VXRS_HIGH, sizeof(sa->vxrs_high)); -- size += nt_size(NT_S390_VXRS_LOW, sizeof(sa->vxrs_low)); -+ size += nt_size(S390_VXRS_HIGH, sa->vxrs_high); -+ size += nt_size(S390_VXRS_LOW, sa->vxrs_low); - } - - return size; -@@ -371,7 +355,7 @@ static void *nt_prpsinfo(void *ptr) - memset(&prpsinfo, 0, sizeof(prpsinfo)); - prpsinfo.pr_sname = 'R'; - strcpy(prpsinfo.pr_fname, "vmlinux"); -- return nt_init(ptr, NT_PRPSINFO, &prpsinfo, sizeof(prpsinfo)); -+ return nt_init(ptr, PRPSINFO, prpsinfo); - } - - /* -@@ -610,7 +594,7 @@ static size_t get_elfcorehdr_size(int phdr_count) - /* PT_NOTES */ - size += sizeof(Elf64_Phdr); - /* nt_prpsinfo */ -- size += nt_size(NT_PRPSINFO, sizeof(struct elf_prpsinfo)); -+ size += nt_size(PRPSINFO, struct elf_prpsinfo); - /* regsets */ - size += get_cpu_cnt() * get_cpu_elf_notes_size(); - /* nt_vmcoreinfo */ --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index b95c4b642c..7d2f116a75 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -529,7 +529,6 @@ powerpc-pseries-iommu-create-ddw-for-devices-with-dm.patch arch-powerpc-perf-check-the-instruction-type-before-.patch ip-fib_rules-fetch-net-from-fib_rule-in-fib-46-_rule.patch r8152-add-vendor-device-id-pair-for-dell-alienware-a.patch -s390-crash-use-note-name-macros.patch iio-adc-ad7944-don-t-use-storagebits-for-sizing.patch igc-avoid-unnecessary-link-down-event-in-xdp_setup_p.patch pstore-change-kmsg_bytes-storage-size-to-u32.patch