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://

* 'core-fixes-for-linus' of git://
  lockdep: fix spurious 'inconsistent lock state' warning
parents 04cde035 6951b12a
......@@ -2582,7 +2582,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
hlock->trylock = trylock;
hlock->read = read;
hlock->check = check;
hlock->hardirqs_off = hardirqs_off;
hlock->hardirqs_off = !!hardirqs_off;
hlock->waittime_stamp = 0;
hlock->holdtime_stamp = sched_clock();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment