Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits)
  ACPI: suppress power button event on S3 resume
  ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
  ACPI: use for_each_possible_cpu() instead of for_each_cpu()
  ACPI: delete newly added debugging macros in processor_perflib.c
  ACPI: UP build fix for bugzilla-5737
  Enable P-state software coordination via _PDC
  P-state software coordination for speedstep-centrino
  P-state software coordination for acpi-cpufreq
  P-state software coordination for ACPI core
  ACPI: create acpi_thermal_resume()
  ACPI: create acpi_fan_suspend()/acpi_fan_resume()
  ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend()
  ACPI: create acpi_device_suspend()/acpi_device_resume()
  ACPI: replace spin_lock_irq with mutex for ec poll mode
  ACPI: Allow a WAN module enable/disable on a Thinkpad X60.
  sem2mutex: acpi, acpi_link_lock
  ACPI: delete unused acpi_bus_drivers_lock
  sem2mutex: drivers/acpi/processor_perflib.c
  ACPI add ia64 exports to build acpi_memhotplug as a module
  ACPI: asus_acpi_init(): propagate correct return value
  ...

Manual resolve of conflicts in:

	arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
	arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
	include/acpi/processor.h

1 files changed, 15 insertions, 10 deletions

diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 53356a591ac1..05230baf5de8 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -68,7 +68,7 @@ ACPI_MODULE_NAME("dsutils")
  ******************************************************************************/
 void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
 {
-        ACPI_FUNCTION_NAME("ds_clear_implicit_return");
+        ACPI_FUNCTION_NAME(ds_clear_implicit_return);
 
         /*
          * Slack must be enabled for this feature
@@ -115,7 +115,7 @@ u8
 acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,
                            struct acpi_walk_state *walk_state, u8 add_reference)
 {
-        ACPI_FUNCTION_NAME("ds_do_implicit_return");
+        ACPI_FUNCTION_NAME(ds_do_implicit_return);
 
         /*
          * Slack must be enabled for this feature, and we must
@@ -171,7 +171,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 {
         const struct acpi_opcode_info *parent_info;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_is_result_used", op);
+        ACPI_FUNCTION_TRACE_PTR(ds_is_result_used, op);
 
         /* Must have both an Op and a Result Object */
 
@@ -202,6 +202,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
          */
         if ((!op->common.parent) ||
             (op->common.parent->common.aml_opcode == AML_SCOPE_OP)) {
+
                 /* No parent, the return value cannot possibly be used */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
@@ -340,7 +341,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
         union acpi_operand_object *obj_desc;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
+        ACPI_FUNCTION_TRACE_PTR(ds_delete_result_if_not_used, result_obj);
 
         if (!op) {
                 ACPI_ERROR((AE_INFO, "Null Op"));
@@ -352,6 +353,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
         }
 
         if (!acpi_ds_is_result_used(op, walk_state)) {
+
                 /* Must pop the result stack (obj_desc should be equal to result_obj) */
 
                 status = acpi_ds_result_pop(&obj_desc, walk_state);
@@ -382,7 +384,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)
         u32 i;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_resolve_operands", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ds_resolve_operands, walk_state);
 
         /*
          * Attempt to resolve each of the valid operands
@@ -417,7 +419,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
 {
         u32 i;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_clear_operands", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ds_clear_operands, walk_state);
 
         /* Remove a reference on each operand on the stack */
 
@@ -465,7 +467,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
         acpi_interpreter_mode interpreter_mode;
         const struct acpi_opcode_info *op_info;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_create_operand", arg);
+        ACPI_FUNCTION_TRACE_PTR(ds_create_operand, arg);
 
         /* A valid name must be looked up in the namespace */
 
@@ -498,7 +500,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                  */
                 if ((walk_state->deferred_node) &&
                     (walk_state->deferred_node->type == ACPI_TYPE_BUFFER_FIELD)
-                    && (arg_index != 0)) {
+                    && (arg_index ==
+                        (u32) ((walk_state->opcode ==
+                                AML_CREATE_FIELD_OP) ? 3 : 2))) {
                         obj_desc =
                             ACPI_CAST_PTR(union acpi_operand_object,
                                           walk_state->deferred_node);
@@ -521,6 +525,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                             && (parent_op->common.aml_opcode != AML_REGION_OP)
                             && (parent_op->common.aml_opcode !=
                                 AML_INT_NAMEPATH_OP)) {
+
                                 /* Enter name into namespace if not found */
 
                                 interpreter_mode = ACPI_IMODE_LOAD_PASS2;
@@ -572,7 +577,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
 
                 /* Free the namestring created above */
 
-                ACPI_MEM_FREE(name_string);
+                ACPI_FREE(name_string);
 
                 /* Check status from the lookup */
 
@@ -696,7 +701,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
         union acpi_parse_object *arg;
         u32 arg_count = 0;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_create_operands", first_arg);
+        ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);
 
         /* For all arguments in the list... */