diff options
author | Bob Moore <robert.moore@intel.com> | 2008-07-04 10:53:58 +0800 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:14:38 -0400 |
commit | 0a1fbf2db0d275f0f8160bb9c3e51c4df5bafdc2 (patch) | |
tree | 030acc9af2f3e0ee2a7285f85ef7dc8f60b8174b | |
parent | c9bdd8057d706a972d804d2d8614a283641a5660 (diff) | |
download | linux-3.10-0a1fbf2db0d275f0f8160bb9c3e51c4df5bafdc2.tar.gz linux-3.10-0a1fbf2db0d275f0f8160bb9c3e51c4df5bafdc2.tar.bz2 linux-3.10-0a1fbf2db0d275f0f8160bb9c3e51c4df5bafdc2.zip |
ACPICA: Return method arg count from acpi_get_object_info
Also update the debugger so that the correct number of arguments is
passed to the method. Prevents a warning message from the debugger.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/namespace/nsxfname.c | 4 | ||||
-rw-r--r-- | include/acpi/actypes.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c index 3cb910ded44..5efa4e7ddb0 100644 --- a/drivers/acpi/namespace/nsxfname.c +++ b/drivers/acpi/namespace/nsxfname.c @@ -265,6 +265,10 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer) info->name = node->name.integer; info->valid = 0; + if (node->type == ACPI_TYPE_METHOD) { + info->param_count = node->object->method.param_count; + } + status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); if (ACPI_FAILURE(status)) { goto cleanup; diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 73d6b1cb07f..6bd08e83f31 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -859,6 +859,7 @@ struct acpi_obj_info_header { struct acpi_device_info { ACPI_COMMON_OBJ_INFO; + u32 param_count; /* If a method, required parameter count */ u32 valid; /* Indicates which fields below are valid */ u32 current_status; /* _STA value */ acpi_integer address; /* _ADR value if any */ |