diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/acpi/executer/exsystem.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/acpi/executer/exsystem.c')
| -rw-r--r-- | drivers/acpi/executer/exsystem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c index 6b5d1e6ce94b..28aef3e69ecc 100644 --- a/drivers/acpi/executer/exsystem.c +++ b/drivers/acpi/executer/exsystem.c | |||
| @@ -60,7 +60,7 @@ ACPI_MODULE_NAME("exsystem") | |||
| 60 | * | 60 | * |
| 61 | * DESCRIPTION: Implements a semaphore wait with a check to see if the | 61 | * DESCRIPTION: Implements a semaphore wait with a check to see if the |
| 62 | * semaphore is available immediately. If it is not, the | 62 | * semaphore is available immediately. If it is not, the |
| 63 | * interpreter is released. | 63 | * interpreter is released before waiting. |
| 64 | * | 64 | * |
| 65 | ******************************************************************************/ | 65 | ******************************************************************************/ |
| 66 | acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) | 66 | acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) |
| @@ -110,9 +110,9 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) | |||
| 110 | * | 110 | * |
| 111 | * RETURN: Status | 111 | * RETURN: Status |
| 112 | * | 112 | * |
| 113 | * DESCRIPTION: Implements a semaphore wait with a check to see if the | 113 | * DESCRIPTION: Implements a mutex wait with a check to see if the |
| 114 | * semaphore is available immediately. If it is not, the | 114 | * mutex is available immediately. If it is not, the |
| 115 | * interpreter is released. | 115 | * interpreter is released before waiting. |
| 116 | * | 116 | * |
| 117 | ******************************************************************************/ | 117 | ******************************************************************************/ |
| 118 | 118 | ||