diff options
| author | Matti Linnanvuori <mattilinnanvuori@yahoo.com> | 2007-10-17 02:29:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:57 -0400 |
| commit | f20fda486164264e0c9a64f3256b3238d0dc78d7 (patch) | |
| tree | 4daca9e4a4bee1a3776c965b8b47c64f14420b3b | |
| parent | 1019f96d2d3aa4997d8055bd0c32c97f0fc21d06 (diff) | |
Mutex documentation is unclear about software interrupts, tasklets and timers
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Documentation/mutex-design.txt | 3 | ||||
| -rw-r--r-- | include/linux/mutex.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt index cbf79881a41c..51f935191ae5 100644 --- a/Documentation/mutex-design.txt +++ b/Documentation/mutex-design.txt | |||
| @@ -90,7 +90,8 @@ of advantages of mutexes: | |||
| 90 | * - task may not exit with mutex held | 90 | * - task may not exit with mutex held |
| 91 | * - memory areas where held locks reside must not be freed | 91 | * - memory areas where held locks reside must not be freed |
| 92 | * - held mutexes must not be reinitialized | 92 | * - held mutexes must not be reinitialized |
| 93 | * - mutexes may not be used in irq contexts | 93 | * - mutexes may not be used in hardware or software interrupt |
| 94 | * contexts such as tasklets and timers | ||
| 94 | 95 | ||
| 95 | furthermore, there are also convenience features in the debugging | 96 | furthermore, there are also convenience features in the debugging |
| 96 | code: | 97 | code: |
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 6a735c72f23f..601479772b98 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h | |||
| @@ -29,7 +29,8 @@ | |||
| 29 | * - task may not exit with mutex held | 29 | * - task may not exit with mutex held |
| 30 | * - memory areas where held locks reside must not be freed | 30 | * - memory areas where held locks reside must not be freed |
| 31 | * - held mutexes must not be reinitialized | 31 | * - held mutexes must not be reinitialized |
| 32 | * - mutexes may not be used in irq contexts | 32 | * - mutexes may not be used in hardware or software interrupt |
| 33 | * contexts such as tasklets and timers | ||
| 33 | * | 34 | * |
| 34 | * These semantics are fully enforced when DEBUG_MUTEXES is | 35 | * These semantics are fully enforced when DEBUG_MUTEXES is |
| 35 | * enabled. Furthermore, besides enforcing the above rules, the mutex | 36 | * enabled. Furthermore, besides enforcing the above rules, the mutex |