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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF123C10F02 for ; Mon, 18 Feb 2019 14:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A67EA2177E for ; Mon, 18 Feb 2019 14:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499525; bh=V9WzqRCRE5udLyTFg2wVqacKjLnDU7NibAWq64ci1Ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r3mfJDqTpl0P/87dPeX5x7r5bPeE5VYksUKAshhc/8NgJAYL2lPtBrctHBmDTnP3f PTo5qzi4bU1vU9EbahXDuNyl1Qihd3CiRqA0nwE4EJhJ/qgiPVa8ETqkGCy2n+ysCb Lqy0SPaRsIJWbKTp8IzizkIRkjjIxkJXriYIWra4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390337AbfBROSo (ORCPT ); Mon, 18 Feb 2019 09:18:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:52002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390975AbfBROIj (ORCPT ); Mon, 18 Feb 2019 09:08:39 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 66F4D204FD; Mon, 18 Feb 2019 14:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498918; bh=V9WzqRCRE5udLyTFg2wVqacKjLnDU7NibAWq64ci1Ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z1Ctuu6XGG4webLcmix9oDqrcXpYYem0iRmV/D2f0mdGVes7Kq1d/S/COZDgN4wCs R1IqPsAd/Z8VmapdscRN5CZ1cHCtt82fk8RlhEbCCGMSx+rsL8EVZnxUDAZqwXuw7g 4KlpEjJi1n0ADslO/iopTn8VHdm79Z3ELANXVfs4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bart Van Assche , Thomas Gleixner , peterz@infradead.org, tj@kernel.org, johannes.berg@intel.com, Sasha Levin Subject: [PATCH 3.18 019/108] timekeeping: Use proper seqcount initializer Date: Mon, 18 Feb 2019 14:43:15 +0100 Message-Id: <20190218133520.397474840@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit ce10a5b3954f2514af726beb78ed8d7350c5e41c ] tk_core.seq is initialized open coded, but that misses to initialize the lockdep map when lockdep is enabled. Lockdep splats involving tk_core seq consequently lack a name and are hard to read. Use the proper initializer which takes care of the lockdep map initialization. [ tglx: Massaged changelog ] Signed-off-by: Bart Van Assche Signed-off-by: Thomas Gleixner Cc: peterz@infradead.org Cc: tj@kernel.org Cc: johannes.berg@intel.com Link: https://lkml.kernel.org/r/20181128234325.110011-12-bvanassche@acm.org Signed-off-by: Sasha Levin --- kernel/time/timekeeping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 70e3e6ae06d2..05397615d048 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -39,7 +39,9 @@ static struct { seqcount_t seq; struct timekeeper timekeeper; -} tk_core ____cacheline_aligned; +} tk_core ____cacheline_aligned = { + .seq = SEQCNT_ZERO(tk_core.seq), +}; static DEFINE_RAW_SPINLOCK(timekeeper_lock); static struct timekeeper shadow_timekeeper; -- 2.19.1