From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E204C4167B for ; Tue, 20 Dec 2022 10:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233540AbiLTKXo (ORCPT ); Tue, 20 Dec 2022 05:23:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233296AbiLTKXm (ORCPT ); Tue, 20 Dec 2022 05:23:42 -0500 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8415FAF2; Tue, 20 Dec 2022 02:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1671531821; x=1703067821; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Xh5Y6FwbdNID/96r51blgPxGkBw0GmwLd4y9nEZHdW0=; b=DVqNZTjdvFEIArPZTwailrkzdVyJbTakHZgTPrNY8UXrDGwsIVWBcZZS WkVNux1lEm0Crly1hCPMtZo92onHvmUhCVbDir5GZ81XEWiQxKC3D/pdA LgkFH3E0+PbNPDp+hZdmW2bVEiihhcDEVL974Kysyt0UzilNKl1cT19WL 4n8bysDuEW8lTAVx/gmnoMla0dmuBXsiytSTO3ImogIxqTmIxJ4V7t6ga QZud7kbeYPa7MW7RDI5jEsrVe7wYuU5xKk9rxGxq8GsecB7SK/FPGr0qh l90YNmfPSewY6k5V4VPgmqiszwr5BCFNp6V4I4ZFgv8C+JGYZZWP8p1EP Q==; From: Rickard Andersson To: , CC: , , , Rickard x Andersson , Subject: [PATCH v2] gcov: Add support for checksum field Date: Tue, 20 Dec 2022 11:23:18 +0100 Message-ID: <20221220102318.3418501-1-rickaran@axis.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail05w.axis.com (10.20.40.11) To se-mail03w.axis.com (10.20.40.9) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rickard x Andersson 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. Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson Reviewed-by: Peter Oberparleiter Tested-by: Peter Oberparleiter Cc: --- kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index c699feda21ac..04880d8fba25 100644 --- 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; -- 2.30.2