diff --git a/[refs] b/[refs] index 599d5013ccff..cb2d4080883f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfd348fd6e2a5dcba68f4195ca642602d3a33cc3 +refs/heads/master: 343b9019808eb4df2a1b4429a8b95d21bf45a9e9 diff --git a/trunk/Documentation/mutex-design.txt b/trunk/Documentation/mutex-design.txt index 51f935191ae5..aa60d1f627e5 100644 --- a/trunk/Documentation/mutex-design.txt +++ b/trunk/Documentation/mutex-design.txt @@ -133,4 +133,6 @@ the APIs of 'struct mutex' have been streamlined: int mutex_trylock(struct mutex *lock); void mutex_unlock(struct mutex *lock); int mutex_is_locked(struct mutex *lock); - + void mutex_lock_nested(struct mutex *lock, unsigned int subclass); + int mutex_lock_interruptible_nested(struct mutex *lock, + unsigned int subclass);