From: Greg Kroah-Hartman Date: Wed, 28 Dec 2022 13:13:25 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.15.86~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40b6700c48744b835a1a4e7d88184c5707ea794a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: gcov-add-support-for-checksum-field.patch --- diff --git a/queue-5.4/gcov-add-support-for-checksum-field.patch b/queue-5.4/gcov-add-support-for-checksum-field.patch new file mode 100644 index 00000000000..2d5265f13be --- /dev/null +++ b/queue-5.4/gcov-add-support-for-checksum-field.patch @@ -0,0 +1,49 @@ +From e96b95c2b7a63a454b6498e2df67aac14d046d13 Mon Sep 17 00:00:00 2001 +From: Rickard x Andersson +Date: Tue, 20 Dec 2022 11:23:18 +0100 +Subject: gcov: add support for checksum field + +From: Rickard x Andersson + +commit e96b95c2b7a63a454b6498e2df67aac14d046d13 upstream. + +In GCC version 12.1 a checksum field was added. + +This patch fixes a kernel crash occurring during boot when using +gcov-kernel with GCC version 12.2. The crash occurred on a system running +on i.MX6SX. + +Link: https://lkml.kernel.org/r/20221220102318.3418501-1-rickaran@axis.com +Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") +Signed-off-by: Rickard x Andersson +Reviewed-by: Peter Oberparleiter +Tested-by: Peter Oberparleiter +Reviewed-by: Martin Liska +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + kernel/gcov/gcc_4_7.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/kernel/gcov/gcc_4_7.c ++++ b/kernel/gcov/gcc_4_7.c +@@ -85,6 +85,7 @@ struct gcov_fn_info { + * @version: gcov version magic indicating the gcc version used for compilation + * @next: list head for a singly-linked list + * @stamp: uniquifying time stamp ++ * @checksum: unique object checksum + * @filename: name of the associated gcov data file + * @merge: merge functions (null for unused counter type) + * @n_functions: number of instrumented functions +@@ -97,6 +98,10 @@ struct gcov_info { + unsigned int version; + struct gcov_info *next; + unsigned int stamp; ++ /* Since GCC 12.1 a checksum field is added. */ ++#if (__GNUC__ >= 12) ++ unsigned int checksum; ++#endif + const char *filename; + void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); + unsigned int n_functions; diff --git a/queue-5.4/series b/queue-5.4/series index ead206cb8a2..f1025407ab5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -450,3 +450,4 @@ reiserfs-add-missing-calls-to-reiserfs_security_free.patch iio-adc-ad_sigma_delta-do-not-use-internal-iio_dev-lock.patch iio-adc128s052-add-proper-.data-members-in-adc128_of_match-table.patch regulator-core-fix-deadlock-on-regulator-enable.patch +gcov-add-support-for-checksum-field.patch