Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a0e4287 authored by Rickard x Andersson's avatar Rickard x Andersson Committed by Greg Kroah-Hartman
Browse files

gcov: add support for checksum field 

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: default avatarRickard x Andersson <rickaran@axis.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Tested-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: default avatarMartin Liska <mliska@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 328f3c08

kernel/gcov/gcc_4_7.c

+5 −0
Original line number Diff line number Diff line
@@ -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;