aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-18 12:09:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-18 12:09:56 -0700
commitbba595255fa70af175f6ce4dc0cb3e7cf91f53d7 (patch)
tree67517f07e9ae9b11cd4ebf384bcaeccf358c6994
parent04cde035fa47b4a7465a15db8d6eaebcc15a68af (diff)
parent6951b12a0fe7fc64789f2c4d62d2a304e93836a8 (diff)
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
-rw-r--r--kernel/lockdep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 77fa776a2da8..3bfb1877a003 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -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();

Privacy Policy