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/osl.c | |
| parent | b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d (diff) | |
| download | linux-3.10-e21c1ca3f98529921c829a792dfdbfc5a5dc393b.tar.gz linux-3.10-e21c1ca3f98529921c829a792dfdbfc5a5dc393b.tar.bz2 linux-3.10-e21c1ca3f98529921c829a792dfdbfc5a5dc393b.zip | |
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/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index eedb05c6dc7..47dfde95b8f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -136,16 +136,6 @@ void acpi_os_vprintf(const char *fmt, va_list args) #endif } - -extern int acpi_in_resume; -void *acpi_os_allocate(acpi_size size) -{ - if (acpi_in_resume) - return kmalloc(size, GFP_ATOMIC); - else - return kmalloc(size, GFP_KERNEL); -} - acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) { if (efi_enabled) { @@ -1115,26 +1105,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object) return (AE_OK); } -/******************************************************************************* - * - * FUNCTION: acpi_os_acquire_object - * - * PARAMETERS: Cache - Handle to cache object - * ReturnObject - Where the object is returned - * - * RETURN: Status - * - * DESCRIPTION: Return a zero-filled object. - * - ******************************************************************************/ - -void *acpi_os_acquire_object(acpi_cache_t * cache) -{ - void *object = kmem_cache_zalloc(cache, GFP_KERNEL); - WARN_ON(!object); - return object; -} - /****************************************************************************** * * FUNCTION: acpi_os_validate_interface |