commit bba595255fa70af175f6ce4dc0cb3e7cf91f53d7 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 17 years ago bba59525 04cde035

+1 -1

1 changed file

expand all

unified split

kernel

lockdep.c

+1 -1

kernel/lockdep.c

··· 2582 hlock->trylock = trylock; 2583 hlock->read = read; 2584 hlock->check = check; 2585 - hlock->hardirqs_off = hardirqs_off; 2586 #ifdef CONFIG_LOCK_STAT 2587 hlock->waittime_stamp = 0; 2588 hlock->holdtime_stamp = sched_clock();

··· 2582 hlock->trylock = trylock; 2583 hlock->read = read; 2584 hlock->check = check; 2585 + hlock->hardirqs_off = !!hardirqs_off; 2586 #ifdef CONFIG_LOCK_STAT 2587 hlock->waittime_stamp = 0; 2588 hlock->holdtime_stamp = sched_clock();