lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcov: add support for checksum field

Browse Source 
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 <rickaran@axis.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Tested-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: Martin Liska <mliska@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rickard x Andersson 2022-12-20 11:23:18 +01:00 committed by Greg Kroah-Hartman
parent 328f3c084f
commit 2a0e42877d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/gcov/gcc_4_7.c
View File

@ -85,6 +85,7 @@ struct gcov_fn_info {
* @version: gcov version magic indicating the gcc version used for compilation * @version: gcov version magic indicating the gcc version used for compilation
* @next: list head for a singly-linked list * @next: list head for a singly-linked list
* @stamp: uniquifying time stamp * @stamp: uniquifying time stamp
* @checksum: unique object checksum
* @filename: name of the associated gcov data file * @filename: name of the associated gcov data file
* @merge: merge functions (null for unused counter type) * @merge: merge functions (null for unused counter type)
* @n_functions: number of instrumented functions * @n_functions: number of instrumented functions
@ -97,6 +98,10 @@ struct gcov_info {
unsigned int version; unsigned int version;
struct gcov_info *next; struct gcov_info *next;
unsigned int stamp; unsigned int stamp;
/* Since GCC 12.1 a checksum field is added. */
#if (__GNUC__ >= 12)
unsigned int checksum;
#endif
const char *filename; const char *filename;
void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int);
unsigned int n_functions; unsigned int n_functions;