mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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
This commit is contained in:
commit
bba595255f
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
#ifdef CONFIG_LOCK_STAT
|
||||
hlock->waittime_stamp = 0;
|
||||
hlock->holdtime_stamp = sched_clock();
|
||||
|
|
Loading…
Reference in a new issue