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 /include | |
| parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
| download | linux-3.10-ba290ab7dace8b3339c0cc86c221d48eed21e956.tar.gz linux-3.10-ba290ab7dace8b3339c0cc86c221d48eed21e956.tar.bz2 linux-3.10-ba290ab7dace8b3339c0cc86c221d48eed21e956.zip | |
Pull kmalloc into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acmacros.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index 4bb38068f40..f1ac6109556 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h @@ -726,7 +726,7 @@ #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) -#define ACPI_FREE(a) acpi_os_free(a) +#define ACPI_FREE(a) kfree(a) #define ACPI_MEM_TRACKING(a) #else diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 89bc4a16c2e..0cd63bce0ae 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle); */ void *acpi_os_allocate(acpi_size size); -void acpi_os_free(void *memory); - acpi_status acpi_os_map_memory(acpi_physical_address physical_address, acpi_size size, void __iomem ** logical_address); |