aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-08-17 20:26:37 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-18 03:42:31 -0400
commit6951b12a0fe7fc64789f2c4d62d2a304e93836a8 (patch)
tree85588afbb9fce0ab0f6aac7c9a5d885562f2c51f /kernel
parentb09c3e3f1710b554348c98e78fbf4a661918779a (diff)
lockdep: fix spurious 'inconsistent lock state' warning
Since f82b217e3513fe3af342c0f3ee1494e86250c21c lockdep can output spurious warnings related to hwirqs due to hardirq_off shrinkage from int to bit-sized flag. Guard it with double negation to fix the warning. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-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,
2582 hlock->trylock = trylock; 2582 hlock->trylock = trylock;
2583 hlock->read = read; 2583 hlock->read = read;
2584 hlock->check = check; 2584 hlock->check = check;
2585 hlock->hardirqs_off = hardirqs_off; 2585 hlock->hardirqs_off = !!hardirqs_off;
2586#ifdef CONFIG_LOCK_STAT 2586#ifdef CONFIG_LOCK_STAT
2587 hlock->waittime_stamp = 0; 2587 hlock->waittime_stamp = 0;
2588 hlock->holdtime_stamp = sched_clock(); 2588 hlock->holdtime_stamp = sched_clock();