X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Facpi%2Facmacros.h;h=192fa095a51583ab6df2bff319ed842c0597ace1;hb=ce26a8532fd062ccd3f3c589a4be269a2dc20f00;hp=f1ac6109556e8d69fa53d3157bfbff877dbafb37;hpb=b197ba3c70638a3a2ae39296781912f26ac0f991;p=powerpc.git

diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index f1ac610955..192fa095a5 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -724,9 +724,15 @@
 
 /* Memory allocation */
 
+#ifndef ACPI_ALLOCATE
 #define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__)
+#endif
+#ifndef ACPI_ALLOCATE_ZEROED
 #define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__)
-#define ACPI_FREE(a)                kfree(a)
+#endif
+#ifndef ACPI_FREE
+#define ACPI_FREE(a)                acpio_os_free(a)
+#endif
 #define ACPI_MEM_TRACKING(a)
 
 #else