diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
| commit | c0dc250e89cb8af77c5689b36eda851158e8573e (patch) | |
| tree | 41c11fb811b31ee28bd20befdc685384f96db1fc /include/acpi/acmacros.h | |
| parent | 0f12b15ebcedce115a5d8e5ff741e49a7993f67c (diff) | |
| parent | e21c1ca3f98529921c829a792dfdbfc5a5dc393b (diff) | |
Pull acpi_os_allocate into test branch
Diffstat (limited to 'include/acpi/acmacros.h')
| -rw-r--r-- | include/acpi/acmacros.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index f1ac6109556e..192fa095a515 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
| @@ -724,9 +724,15 @@ | |||
| 724 | 724 | ||
| 725 | /* Memory allocation */ | 725 | /* Memory allocation */ |
| 726 | 726 | ||
| 727 | #ifndef ACPI_ALLOCATE | ||
| 727 | #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) | 728 | #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) |
| 729 | #endif | ||
| 730 | #ifndef ACPI_ALLOCATE_ZEROED | ||
| 728 | #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) | 731 | #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) |
| 729 | #define ACPI_FREE(a) kfree(a) | 732 | #endif |
| 733 | #ifndef ACPI_FREE | ||
| 734 | #define ACPI_FREE(a) acpio_os_free(a) | ||
| 735 | #endif | ||
| 730 | #define ACPI_MEM_TRACKING(a) | 736 | #define ACPI_MEM_TRACKING(a) |
| 731 | 737 | ||
| 732 | #else | 738 | #else |