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 /include | |
| parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
| download | linux-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.gz | |
Pull acpi_os_free 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 4bb38068f40dc..f1ac6109556e8 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 89bc4a16c2e89..0cd63bce0ae42 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); |