Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6951b12a authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Ingo Molnar
Browse files

lockdep: fix spurious 'inconsistent lock state' warning 



Since f82b217e lockdep can output spurious
warnings related to hwirqs due to hardirq_off shrinkage from int to bit-sized
flag. Guard it with double negation to fix the warning.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b09c3e3f

kernel/lockdep.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2582,7 +2582,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, 
	hlock->trylock = trylock;

	hlock->trylock = trylock;

	hlock->read = read;

	hlock->read = read;

	hlock->check = check;

	hlock->check = check;

	hlock->hardirqs_off = hardirqs_off;

	hlock->hardirqs_off = !!hardirqs_off;

#ifdef CONFIG_LOCK_STAT

#ifdef CONFIG_LOCK_STAT

	hlock->waittime_stamp = 0;

	hlock->waittime_stamp = 0;

	hlock->holdtime_stamp = sched_clock();

	hlock->holdtime_stamp = sched_clock();