diff --git a/[refs] b/[refs] index 3f8fd2994f9f..178a24bbaa5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88aa0103e408616e433c209e80169ab8d6eda99e +refs/heads/master: 07646e217f473a3e6213f8228336a9046833d6aa diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index 14fec2a23b2e..819f08f1310d 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -268,6 +268,8 @@ static inline int lockdep_internal(void) do { (void)(key); } while (0) #define lockdep_set_class_and_subclass(lock, key, sub) \ do { (void)(key); } while (0) +#define lockdep_set_subclass(lock, sub) do { } while (0) + # define INIT_LOCKDEP # define lockdep_reset() do { debug_locks = 1; } while (0) # define lockdep_free_key_range(start, size) do { } while (0)