lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 105/258] timekeeping: Use proper seqcount initializer
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ 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 <bvanassche@acm.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    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 <sashal@kernel.org>
    ---
    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 f3b22f456fac..7846ce24ecc0 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
    \
     
     \ /
      Last update: 2019-01-28 18:21    [W:4.042 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site