diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:42:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:42:52 -0700 |
| commit | a7e1e001f432d5960b929787a2a261cf5a7ddac5 (patch) | |
| tree | b340cb74237427dbdbdacf618c42e8b0bd8d21d5 /kernel/lockdep.c | |
| parent | 21806261b6cc1068197ea6c8891b857f16260fee (diff) | |
| parent | 17aacfb9cdf9a8329a6ece9c437551a29c93e47b (diff) | |
| download | op-kernel-dev-a7e1e001f432d5960b929787a2a261cf5a7ddac5.zip op-kernel-dev-a7e1e001f432d5960b929787a2a261cf5a7ddac5.tar.gz | |
Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
* 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
lockdep: fix a typo in the __lock_acquire comment
sched: fix unconditional irq lock
lockdep: fixup irq tracing
Diffstat (limited to 'kernel/lockdep.c')
| -rw-r--r-- | kernel/lockdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 55fe0c7..ed38bbf 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -2424,7 +2424,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, return 0; /* - * Calculate the chain hash: it's the combined has of all the + * Calculate the chain hash: it's the combined hash of all the * lock keys along the dependency chain. We save the hash value * at every step so that we can get the current hash easily * after unlock. The chain hash is then used to cache dependency |
