summaryrefslogtreecommitdiffstats
path: root/patch-5.17-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-01-28 09:41:44 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-01-28 09:41:44 -0600
commit2baea89da1692847bfba25e77741beee9b43f9bf (patch)
tree7c3de28fab59cfdd40d3c16b6c1cc38e438e2674 /patch-5.17-redhat.patch
parent854c564e0729cc458e4878c09b63853ad406718b (diff)
downloadkernel-2baea89da1692847bfba25e77741beee9b43f9bf.tar.gz
kernel-2baea89da1692847bfba25e77741beee9b43f9bf.tar.xz
kernel-2baea89da1692847bfba25e77741beee9b43f9bf.zip
kernel-5.17-0.rc1.20220128git145d9b498fc8.79
* Fri Jan 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220128git145d9b498fc8.79] - Add test_hash to the mod-internal.list (Justin M. Forbes) - configs: disable CONFIG_CRAMFS (Abhi Das) [2041184] Resolves: rhbz#2041184 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.17-redhat.patch')
-rw-r--r--patch-5.17-redhat.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index a3478f0c5..90d82574b 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -3187,3 +3187,38 @@ index c2d2ab9a2861..f5bed94e4558 100644
struct reloc *rel;
int idx;
+From b3d2907a37c53f7379be8742bfbfe47aa2877bfc Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Thu, 27 Jan 2022 15:33:37 -0600
+Subject: [PATCH] Fix subcmd-util for gcc 12
+
+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
+---
+ tools/lib/subcmd/subcmd-util.h | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
+index 794a375dad36..7009fc176636 100644
+--- a/tools/lib/subcmd/subcmd-util.h
++++ b/tools/lib/subcmd/subcmd-util.h
+@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...)
+
+ static inline void *xrealloc(void *ptr, size_t size)
+ {
+- void *ret = realloc(ptr, size);
+- if (!ret && !size)
+- ret = realloc(ptr, 1);
++ void *ret;
++ if (!size)
++ size = 1;
++ ret = realloc(ptr, size);
+ if (!ret) {
+ ret = realloc(ptr, size);
+- if (!ret && !size)
+- ret = realloc(ptr, 1);
+ if (!ret)
+ die("Out of memory, realloc failed");
+ }
+--
+2.34.1
+