Merge branch 'linus' into x86/urgent

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 05e61be267d5..352747e49c7a 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -97,7 +97,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
         acpi_status status;
         union acpi_operand_object *string_desc;
         union acpi_operand_object *return_desc;
-        acpi_native_uint i;
+        u32 i;
 
         ACPI_FUNCTION_TRACE(ut_osi_implementation);
 
@@ -217,7 +217,6 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
         info->prefix_node = prefix_node;
         info->pathname = path;
-        info->parameter_type = ACPI_PARAM_ARGS;
 
         /* Evaluate the object/method */
 
@@ -514,7 +513,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,
         u32 count;
         u32 size;
         struct acpi_compatible_id_list *cid_list;
-        acpi_native_uint i;
+        u32 i;
 
         ACPI_FUNCTION_TRACE(ut_execute_CID);