commit e21c1ca3f98529921c829a792dfdbfc5a5dc393b
author Len Brown <len.brown@intel.com> Mon Jul 10 01:35:51 2006 -0400
committer Len Brown <len.brown@intel.com> Mon Jul 10 02:37:22 2006 -0400
tree fdb0a3c00d46db197ae65e6c66fc841b194cb507
parent b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d

ACPI: acpi_os_allocate() fixes

Replace acpi_in_resume with a more general hack
to check irqs_disabled() on any kmalloc() from ACPI.
While setting (system_state != SYSTEM_RUNNING) on resume
seemed more general, Andrew Morton preferred this approach.

http://bugzilla.kernel.org/show_bug.cgi?id=3469

Make acpi_os_allocate() into an inline function to
allow /proc/slab_allocators to work.

Delete some memset() that could fault on allocation failure.

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/utilities/utalloc.c

diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 5cff17d..f6cbc0b 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -285,6 +285,7 @@
 	return (status);
 }
 
+#ifdef NOT_USED_BY_LINUX
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_allocate
@@ -360,3 +361,4 @@
 
 	return (allocation);
 }
+#endif