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

bba59525 · Linus Torvalds <[email protected]> · 2008-08-18 12:09:56 -07:00

* '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

Commit: bba595255fa70af175f6ce4dc0cb3e7cf91f53d7
Parents: 04cde035 · 6951b12a

Merge commit. Changes below are compared with the first parent: 04cde035.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/lockdep.c	modified	+1	−1	View file

kernel/lockdep.c

View file

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 77fa776..3bfb187 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();