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.0 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=ham 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 D3D9CC169C4 for ; Mon, 11 Feb 2019 14:27:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3A03214DA for ; Mon, 11 Feb 2019 14:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895256; bh=XhC61yACJXCdksXtOf2jJX1KxZ7y5aqEoCzff83DXqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uR4fZ6xH9z9xRtP8PS0/TkeU9kfP5+mca6dUwO4S/rf/IDiqvnYsR/ER9m2G92BgG pkB6QGbE1W0DxtEZDwc3rWykjW91jPOJMh+j+E9QN0Q+2SpAlPccQkLzEQmj4Nc3xN qfr8NYFZSdc2hyY2KK/It33H44x6a1+PhmoLBlGc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727723AbfBKO1f (ORCPT ); Mon, 11 Feb 2019 09:27:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:33386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727966AbfBKO1e (ORCPT ); Mon, 11 Feb 2019 09:27:34 -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 AB29220821; Mon, 11 Feb 2019 14:27:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895254; bh=XhC61yACJXCdksXtOf2jJX1KxZ7y5aqEoCzff83DXqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MZA9EgkwdCyIkq0bJBQ8F0D68M4Bu1jBOHr+kB564vPld/wMouILND5Br9MqzDcoB m8AkyXLe4WwgtJdBuhlnqgXj895LwLOur1PQ0ShdHi4sWzohOxwxYHaAiAlhqZeZZH ng17yuLkdvxBeKNfFa6EpJ7mz7uW/epRYQionQr4= 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 4.20 114/352] timekeeping: Use proper seqcount initializer Date: Mon, 11 Feb 2019 15:15:41 +0100 Message-Id: <20190211141853.085192960@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-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 2d110c948805..6c9493495538 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -50,7 +50,9 @@ enum timekeeping_adv_mode { 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