diff --git a/[refs] b/[refs] index ef5199fb1478..c0079bbbfc11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 076fa0fa2d53046d32f5157022d683b8027f05ed +refs/heads/master: 9e860d000a90cfc9ca270ddb6e99b177e6aa91cd diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 7f573136a905..dc4ea4c2b4c8 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -1309,8 +1309,9 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) /* * Look up a dependency chain. If the key is not present yet then - * add it and return 0 - in this case the new dependency chain is - * validated. If the key is already hashed, return 1. + * add it and return 1 - in this case the new dependency chain is + * validated. If the key is already hashed, return 0. + * (On return with 1 graph_lock is held.) */ static inline int lookup_chain_cache(u64 chain_key, struct lock_class *class) {