diff --git a/[refs] b/[refs] index b9be9c5e0d7c..1786d4049db4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c06b4f1947213cd0902610fafcabac02d49ad728 +refs/heads/master: 5cd3f5affad2109fd1458aab3f6216f2181e26ea diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index 2bca44b0893c..f05631effc73 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -410,7 +410,7 @@ struct lock_class_key { }; #define lockdep_depth(tsk) (0) -#define lockdep_assert_held(l) do { } while (0) +#define lockdep_assert_held(l) do { (void)(l); } while (0) #define lockdep_recursing(tsk) (0)