diff options
| -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 |