From: Matti Linnanvuori Acked-by: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton --- Documentation/mutex-design.txt | 3 ++- include/linux/mutex.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff -puN Documentation/mutex-design.txt~mutex-documentation-is-unclear-about-software-interrupts-tasklets-and-timers Documentation/mutex-design.txt --- a/Documentation/mutex-design.txt~mutex-documentation-is-unclear-about-software-interrupts-tasklets-and-timers +++ a/Documentation/mutex-design.txt @@ -90,7 +90,8 @@ of advantages of mutexes: * - task may not exit with mutex held * - memory areas where held locks reside must not be freed * - held mutexes must not be reinitialized - * - mutexes may not be used in irq contexts + * - mutexes may not be used in hardware or software interrupt + * contexts such as tasklets and timers furthermore, there are also convenience features in the debugging code: diff -puN include/linux/mutex.h~mutex-documentation-is-unclear-about-software-interrupts-tasklets-and-timers include/linux/mutex.h --- a/include/linux/mutex.h~mutex-documentation-is-unclear-about-software-interrupts-tasklets-and-timers +++ a/include/linux/mutex.h @@ -29,7 +29,8 @@ * - task may not exit with mutex held * - memory areas where held locks reside must not be freed * - held mutexes must not be reinitialized - * - mutexes may not be used in irq contexts + * - mutexes may not be used in hardware or software interrupt + * contexts such as tasklets and timers * * These semantics are fully enforced when DEBUG_MUTEXES is * enabled. Furthermore, besides enforcing the above rules, the mutex _