Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 16 years ago
parent
04cde035fa 6951b12a0f
commit
bba595255f
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      kernel/lockdep.c

+ 1 - 1
kernel/lockdep.c
View File 

@@ -2582,7 +2582,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 
 	hlock->trylock = trylock;
 
 	hlock->trylock = trylock;
 
 	hlock->read = read;
 
 	hlock->read = read;
 
 	hlock->check = check;
 
 	hlock->check = check;
 
-	hlock->hardirqs_off = hardirqs_off;
 
+	hlock->hardirqs_off = !!hardirqs_off;
 
 #ifdef CONFIG_LOCK_STAT
 
 #ifdef CONFIG_LOCK_STAT
 
 	hlock->waittime_stamp = 0;
 
 	hlock->waittime_stamp = 0;
 
 	hlock->holdtime_stamp = sched_clock();
 
 	hlock->holdtime_stamp = sched_clock();