diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
| commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
| tree | 596f795437337d86edaa02d612120f4d5b3ce35d /drivers/acpi/osl.c | |
| parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
| download | linux-3.10-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.gz linux-3.10-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.bz2 linux-3.10-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 5dd2ed11a38..d4bd314d60b 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; |