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

Commit bba59525 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: fix spurious 'inconsistent lock state' warning
parents 04cde035 6951b12a

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();