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>

2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 3cb910ded44a..5efa4e7ddb0b 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 73d6b1cb07f3..6bd08e83f31c 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 */