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/parser | |
| parent | b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d (diff) | |
| download | blackbird-op-linux-e21c1ca3f98529921c829a792dfdbfc5a5dc393b.tar.gz blackbird-op-linux-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/parser')
| -rw-r--r-- | drivers/acpi/parser/psutils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c index 182474ae8ce9..d405387b7414 100644 --- a/drivers/acpi/parser/psutils.c +++ b/drivers/acpi/parser/psutils.c @@ -139,12 +139,10 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode) /* The generic op (default) is by far the most common (16 to 1) */ op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_common)); } else { /* Extended parseop */ op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_named)); } /* Initialize the Op */ |
