diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
| commit | ba290ab7dace8b3339c0cc86c221d48eed21e956 (patch) | |
| tree | b2e5d1e96b2799cd13010b140ffabd43e8f04963 /drivers/acpi/osl.c | |
| parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
| download | op-kernel-dev-ba290ab7dace8b3339c0cc86c221d48eed21e956.zip op-kernel-dev-ba290ab7dace8b3339c0cc86c221d48eed21e956.tar.gz | |
Pull kmalloc 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 5dd2ed1..d4bd314 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; |
