From 05daf82f13cea169b78fc4d1a9cc3a83612aef89 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Dec 2022 14:13:10 +0100 Subject: [PATCH] 4.14-stable patches added patches: gcov-add-support-for-checksum-field.patch --- .../gcov-add-support-for-checksum-field.patch | 49 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 queue-4.14/gcov-add-support-for-checksum-field.patch diff --git a/queue-4.14/gcov-add-support-for-checksum-field.patch b/queue-4.14/gcov-add-support-for-checksum-field.patch new file mode 100644 index 00000000000..2d5265f13be --- /dev/null +++ b/queue-4.14/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-4.14/series b/queue-4.14/series index 9e74bc011a9..41907618b87 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -260,3 +260,4 @@ usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch hid-wacom-ensure-bootloader-pid-is-usable-in-hidraw-mode.patch reiserfs-add-missing-calls-to-reiserfs_security_free.patch iio-adc-ad_sigma_delta-do-not-use-internal-iio_dev-lock.patch +gcov-add-support-for-checksum-field.patch -- 2.47.3