From e06c7b4bd28f6cb2f4199ef6ce8136fa0b7cbdbd Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 11 Oct 2006 01:22:06 -0700 Subject: [PATCH] --- yaml --- r: 39357 b: refs/heads/master c: 3dc3099a9b2c346b16383597fadaa79a05a52388 h: refs/heads/master i: 39355: 30b7c0da8f30ce8074f4f1fa65f05fed0e8b8d9c v: v3 --- [refs] | 2 +- trunk/kernel/lockdep.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dcd260e74be3..3cb553fced5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39913b31d0cd11b5b18a303e220c95ffbd9e1a88 +refs/heads/master: 3dc3099a9b2c346b16383597fadaa79a05a52388 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 4c0553461000..805a322a5655 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -1114,8 +1114,6 @@ static int count_matching_names(struct lock_class *new_class) return count + 1; } -extern void __error_too_big_MAX_LOCKDEP_SUBCLASSES(void); - /* * Register a lock's class in the hash-table, if the class is not present * yet. Otherwise we look it up. We cache the result in the lock object @@ -1153,8 +1151,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass) * (or spin_lock_init()) call - which acts as the key. For static * locks we use the lock object itself as the key. */ - if (sizeof(struct lock_class_key) > sizeof(struct lock_class)) - __error_too_big_MAX_LOCKDEP_SUBCLASSES(); + BUILD_BUG_ON(sizeof(struct lock_class_key) > sizeof(struct lock_class)); key = lock->key->subkeys + subclass;