diff options
| author | Len Brown | 2006-07-01 23:19:08 +0200 |
|---|---|---|
| committer | Len Brown | 2006-07-01 23:19:08 +0200 |
| commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
| tree | 596f795437337d86edaa02d612120f4d5b3ce35d /drivers/acpi/osl.c | |
| parent | Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | ACPI: delete acpi_os_free(), use kfree() directly (diff) | |
| download | kernel-qcow2-linux-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.gz kernel-qcow2-linux-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.xz kernel-qcow2-linux-b197ba3c70638a3a2ae39296781912f26ac0f991.zip | |
Pull acpi_os_free into release branch
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 5dd2ed11a387..d4bd314d60ba 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -146,13 +146,6 @@ void *acpi_os_allocate(acpi_size size) return kmalloc(size, GFP_KERNEL); } -void acpi_os_free(void *ptr) -{ - kfree(ptr); -} - -EXPORT_SYMBOL(acpi_os_free); - acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) { if (efi_enabled) { @@ -742,7 +735,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle) ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle)); - acpi_os_free(sem); + kfree(sem); sem = NULL; return AE_OK; |