diff options
author | Len Brown <len.brown@intel.com> | 2006-07-10 01:35:51 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:37:22 -0400 |
commit | e21c1ca3f98529921c829a792dfdbfc5a5dc393b (patch) | |
tree | fdb0a3c00d46db197ae65e6c66fc841b194cb507 /drivers/acpi/utilities | |
parent | b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d (diff) |
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>
Diffstat (limited to 'drivers/acpi/utilities')
-rw-r--r-- | drivers/acpi/utilities/utalloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c index 5cff17dc78b3..f6cbc0b1bfd0 100644 --- a/drivers/acpi/utilities/utalloc.c +++ b/drivers/acpi/utilities/utalloc.c | |||
@@ -285,6 +285,7 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer, | |||
285 | return (status); | 285 | return (status); |
286 | } | 286 | } |
287 | 287 | ||
288 | #ifdef NOT_USED_BY_LINUX | ||
288 | /******************************************************************************* | 289 | /******************************************************************************* |
289 | * | 290 | * |
290 | * FUNCTION: acpi_ut_allocate | 291 | * FUNCTION: acpi_ut_allocate |
@@ -360,3 +361,4 @@ void *acpi_ut_allocate_zeroed(acpi_size size, | |||
360 | 361 | ||
361 | return (allocation); | 362 | return (allocation); |
362 | } | 363 | } |
364 | #endif | ||