71 files changed, 1585 insertions, 707 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index bba867391a85..735f5ea17473 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -336,6 +336,15 @@ config ACPI_EC
          the battery and thermal drivers.  If you are compiling for a 
          mobile system, say Y.
+config ACPI_PCI_SLOT
+        tristate "PCI slot detection driver"
+        default n
+        help
+          This driver will attempt to discover all PCI slots in your system,
+          and creates entries in /sys/bus/pci/slots/. This feature can
+          help you correlate PCI bus addresses with the physical geography
+          of your slots. If you are unsure, say N.
 config ACPI_POWER
        bool
        default y
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 40b0fcae4c78..52a4cd4b81d0 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_X86)		+= blacklist.o
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-y                           += osl.o utils.o \
+obj-y                           += osl.o utils.o reboot.o\
                                   dispatcher/ events/ executer/ hardware/ \
                                   namespace/ parser/ resources/ tables/ \
                                   utilities/
@@ -48,6 +48,7 @@ obj-$(CONFIG_ACPI_DOCK)		+= dock.o
 obj-$(CONFIG_ACPI_BAY)          += bay.o
 obj-$(CONFIG_ACPI_VIDEO)        += video.o
 obj-y                           += pci_root.o pci_link.o pci_irq.o pci_bind.o
+obj-$(CONFIG_ACPI_PCI_SLOT)     += pci_slot.o
 obj-$(CONFIG_ACPI_POWER)        += power.o
 obj-$(CONFIG_ACPI_PROCESSOR)    += processor.o
 obj-$(CONFIG_ACPI_CONTAINER)    += container.o
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 61b6c5beb2d3..e6caf5d42e0e 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,6 +380,9 @@ static int __init bay_init(void)
        if (acpi_disabled)
                return -ENODEV;
+        if (acpi_disabled)
+                return -ENODEV;
        /* look for dockable drive bays */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                ACPI_UINT32_MAX, find_bay, &bays, NULL);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a6dbcf4d9ef5..ccae305ee55d 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -295,6 +295,28 @@ int acpi_bus_set_power(acpi_handle handle, int state)
 EXPORT_SYMBOL(acpi_bus_set_power);
+bool acpi_bus_power_manageable(acpi_handle handle)
+{
+        struct acpi_device *device;
+        int result;
+        result = acpi_bus_get_device(handle, &device);
+        return result ? false : device->flags.power_manageable;
+}
+EXPORT_SYMBOL(acpi_bus_power_manageable);
+bool acpi_bus_can_wakeup(acpi_handle handle)
+{
+        struct acpi_device *device;
+        int result;
+        result = acpi_bus_get_device(handle, &device);
+        return result ? false : device->wakeup.flags.valid;
+}
+EXPORT_SYMBOL(acpi_bus_can_wakeup);
 /* --------------------------------------------------------------------------
                                Event Management
   -------------------------------------------------------------------------- */
@@ -612,7 +634,7 @@ static int __init acpi_bus_init_irq(void)
        return 0;
 }
-acpi_native_uint acpi_gbl_permanent_mmap;
+u8 acpi_gbl_permanent_mmap;
 void __init acpi_early_init(void)
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 610b1ee102b0..949f7c75029e 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -151,7 +151,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
 ******************************************************************************/
 acpi_status
-acpi_ds_initialize_objects(acpi_native_uint table_index,
+acpi_ds_initialize_objects(u32 table_index,
                           struct acpi_namespace_node * start_node)
 {
        acpi_status status;
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 2509809a36cf..4613b9ca5792 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -377,7 +377,6 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
        }
        info->parameters = &this_walk_state->operands[0];
-        info->parameter_type = ACPI_PARAM_ARGS;
        status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,
                                       obj_desc->method.aml_start,
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index a818e0ddb996..6a81c4400edf 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -691,12 +691,6 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
        status = acpi_ex_resolve_operands(op->common.aml_opcode,
                                          ACPI_WALK_OPERANDS, walk_state);
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           walk_state->num_operands,
-                           "after AcpiExResolveOperands");
        if (ACPI_FAILURE(status)) {
                ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
                            acpi_ps_get_opcode_name(op->common.aml_opcode),
@@ -785,10 +779,6 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(status);
        }
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           1, "after AcpiExResolveOperands");
        obj_desc = acpi_ns_get_attached_object(node);
        if (!obj_desc) {
                return_ACPI_STATUS(AE_NOT_EXIST);
@@ -848,7 +838,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
        union acpi_operand_object **operand;
        struct acpi_namespace_node *node;
        union acpi_parse_object *next_op;
-        acpi_native_uint table_index;
+        u32 table_index;
        struct acpi_table_header *table;
        ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);
@@ -882,10 +872,6 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(status);
        }
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
-                           1, "after AcpiExResolveOperands");
        operand = &walk_state->operands[0];
        /* Find the ACPI table */
@@ -1091,10 +1077,8 @@ acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(status);
        }
-        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
+        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
-                           acpi_ps_get_opcode_name(op->common.aml_opcode),
+                           acpi_ps_get_opcode_name(op->common.aml_opcode), 1);
-                           1, "after AcpiExResolveOperands");
        /*
         * Get the bank_value operand and save it
         * (at Top of stack)
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index b246b9657ead..b5072fa9c920 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -408,14 +408,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                                            [walk_state->
                                                             num_operands - 1]),
                                                          walk_state);
-                        if (ACPI_SUCCESS(status)) {
-                                ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
-                                                   ACPI_IMODE_EXECUTE,
-                                                   acpi_ps_get_opcode_name
-                                                   (walk_state->opcode),
-                                                   walk_state->num_operands,
-                                                   "after ExResolveOperands");
-                        }
                }
                if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 1386ced332ec..b00d4af791aa 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -70,7 +70,7 @@ acpi_status
 acpi_ds_result_pop(union acpi_operand_object **object,
                   struct acpi_walk_state *walk_state)
 {
-        acpi_native_uint index;
+        u32 index;
        union acpi_generic_state *state;
        acpi_status status;
@@ -122,7 +122,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Obj=%p [%s] Index=%X State=%p Num=%X\n", *object,
                          acpi_ut_get_object_type_name(*object),
-                          (u32) index, walk_state, walk_state->result_count));
+                          index, walk_state, walk_state->result_count));
        return (AE_OK);
 }
@@ -146,7 +146,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
 {
        union acpi_generic_state *state;
        acpi_status status;
-        acpi_native_uint index;
+        u32 index;
        ACPI_FUNCTION_NAME(ds_result_push);
@@ -400,7 +400,7 @@ void
 acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                                 struct acpi_walk_state *walk_state)
 {
-        acpi_native_int i;
+        s32 i;
        union acpi_operand_object *obj_desc;
        ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
@@ -409,7 +409,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                return;
        }
-        for (i = (acpi_native_int) (pop_count - 1); i >= 0; i--) {
+        for (i = (s32) pop_count - 1; i >= 0; i--) {
                if (walk_state->num_operands == 0) {
                        return;
                }
@@ -615,14 +615,8 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
        walk_state->pass_number = pass_number;
        if (info) {
-                if (info->parameter_type == ACPI_PARAM_GPE) {
+                walk_state->params = info->parameters;
-                        walk_state->gpe_event_info =
+                walk_state->caller_return_desc = &info->return_object;
-                            ACPI_CAST_PTR(struct acpi_gpe_event_info,
-                                          info->parameters);
-                } else {
-                        walk_state->params = info->parameters;
-                        walk_state->caller_return_desc = &info->return_object;
-                }
        }
        status = acpi_ps_init_scope(&walk_state->parser_state, op);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bb7c51f712bd..1e872e79db33 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,6 +920,9 @@ static int __init dock_init(void)
        if (acpi_disabled)
                return 0;
+        if (acpi_disabled)
+                return 0;
        /* look for a dock station */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                            ACPI_UINT32_MAX, find_dock, &num, NULL);
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 5d30e5be1b1c..c56c5c6ea77b 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -188,7 +188,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 static acpi_status acpi_ev_fixed_event_initialize(void)
 {
-        acpi_native_uint i;
+        u32 i;
        acpi_status status;
        /*
@@ -231,7 +231,7 @@ u32 acpi_ev_fixed_event_detect(void)
        u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
        u32 fixed_status;
        u32 fixed_enable;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_NAME(ev_fixed_event_detect);
@@ -260,7 +260,7 @@ u32 acpi_ev_fixed_event_detect(void)
                        /* Found an active (signalled) event */
                        acpi_os_fixed_event_count(i);
-                        int_status |= acpi_ev_fixed_event_dispatch((u32) i);
+                        int_status |= acpi_ev_fixed_event_dispatch(i);
                }
        }
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 5354be44f876..c5e53aae86f7 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -256,7 +256,7 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
                return_ACPI_STATUS(status);
        }
-        /* Mark wake-disabled or HW disable, or both */
+        /* Clear the appropriate enabled flags for this GPE */
        switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
        case ACPI_GPE_TYPE_WAKE:
@@ -273,13 +273,23 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
                /* Disable the requested runtime GPE */
                ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
+                break;
-                /* fallthrough */
        default:
-                acpi_hw_write_gpe_enable_reg(gpe_event_info);
+                break;
        }
+        /*
+         * Even if we don't know the GPE type, make sure that we always
+         * disable it. low_disable_gpe will just clear the enable bit for this
+         * GPE and write it. It will not write out the current GPE enable mask,
+         * since this may inadvertently enable GPEs too early, if a rogue GPE has
+         * come in during ACPICA initialization - possibly as a result of AML or
+         * other code that has enabled the GPE.
+         */
+        status = acpi_hw_low_disable_gpe(gpe_event_info);
+        return_ACPI_STATUS(status);
        return_ACPI_STATUS(AE_OK);
 }
@@ -305,7 +315,7 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
 {
        union acpi_operand_object *obj_desc;
        struct acpi_gpe_block_info *gpe_block;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_ENTRY();
@@ -379,8 +389,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
        u32 status_reg;
        u32 enable_reg;
        acpi_cpu_flags flags;
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
        ACPI_FUNCTION_NAME(ev_gpe_detect);
@@ -462,13 +472,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                                         */
                                        int_status |=
                                            acpi_ev_gpe_dispatch(&gpe_block->
-                                                                 event_info[(i *
+                                                event_info[((acpi_size) i * ACPI_GPE_REGISTER_WIDTH) + j], j + gpe_register_info->base_gpe_number);
-                                                                             ACPI_GPE_REGISTER_WIDTH)
-                                                                            +
-                                                                            j],
-                                                                 (u32) j +
-                                                                 gpe_register_info->
-                                                                 base_gpe_number);
                                }
                        }
                }
@@ -555,10 +559,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                         */
                        info->prefix_node =
                            local_gpe_event_info.dispatch.method_node;
-                        info->parameters =
-                            ACPI_CAST_PTR(union acpi_operand_object *,
-                                          gpe_event_info);
-                        info->parameter_type = ACPI_PARAM_GPE;
                        info->flags = ACPI_IGNORE_RETURN_VALUE;
                        status = acpi_ns_evaluate(info);
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index e6c4d4c49e79..73c058e2f5c2 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -189,8 +189,8 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                            struct acpi_gpe_block_info *gpe_block)
 {
        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
        ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
@@ -203,7 +203,8 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
                        gpe_event_info =
                            &gpe_block->
-                            event_info[(i * ACPI_GPE_REGISTER_WIDTH) + j];
+                            event_info[((acpi_size) i *
+                                        ACPI_GPE_REGISTER_WIDTH) + j];
                        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                            ACPI_GPE_DISPATCH_HANDLER) {
@@ -744,8 +745,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
        struct acpi_gpe_event_info *gpe_event_info = NULL;
        struct acpi_gpe_event_info *this_event;
        struct acpi_gpe_register_info *this_register;
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
        acpi_status status;
        ACPI_FUNCTION_TRACE(ev_create_gpe_info_blocks);
@@ -983,8 +984,8 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
        struct acpi_gpe_walk_info gpe_info;
        u32 wake_gpe_count;
        u32 gpe_enabled_count;
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
        ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);
@@ -1033,7 +1034,8 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
                        gpe_event_info =
                            &gpe_block->
-                            event_info[(i * ACPI_GPE_REGISTER_WIDTH) + j];
+                            event_info[((acpi_size) i *
+                                        ACPI_GPE_REGISTER_WIDTH) + j];
                        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                             ACPI_GPE_DISPATCH_METHOD)
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 2113e58e2221..1d5670be729a 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -575,7 +575,7 @@ acpi_status acpi_ev_release_global_lock(void)
 void acpi_ev_terminate(void)
 {
-        acpi_native_uint i;
+        u32 i;
        acpi_status status;
        ACPI_FUNCTION_TRACE(ev_terminate);
@@ -589,7 +589,7 @@ void acpi_ev_terminate(void)
                /* Disable all fixed events */
                for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
-                        status = acpi_disable_event((u32) i, 0);
+                        status = acpi_disable_event(i, 0);
                        if (ACPI_FAILURE(status)) {
                                ACPI_ERROR((AE_INFO,
                                            "Could not disable fixed event %d",
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 1628f5934752..236fbd1ca438 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -81,7 +81,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,
 acpi_status acpi_ev_install_region_handlers(void)
 {
        acpi_status status;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(ev_install_region_handlers);
@@ -151,7 +151,7 @@ acpi_status acpi_ev_install_region_handlers(void)
 acpi_status acpi_ev_initialize_op_regions(void)
 {
        acpi_status status;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(ev_initialize_op_regions);
@@ -219,7 +219,6 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
        info->prefix_node = region_obj2->extra.method_REG;
        info->pathname = NULL;
        info->parameters = args;
-        info->parameter_type = ACPI_PARAM_ARGS;
        info->flags = ACPI_IGNORE_RETURN_VALUE;
        /*
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index 2e3d2c5e4f4d..6b94b38df07d 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -380,7 +380,7 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
        acpi_status status;
        struct acpica_device_id hid;
        struct acpi_compatible_id_list *cid;
-        acpi_native_uint i;
+        u32 i;
        /*
         * Get the _HID and check for a PCI Root Bridge
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 99a7502e6a87..73bfd6bf962f 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 }
 ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-#ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
 *
 * FUNCTION:    acpi_get_event_status
@@ -489,6 +488,7 @@ ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
 acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 {
        acpi_status status = AE_OK;
+        u32 value;
        ACPI_FUNCTION_TRACE(acpi_get_event_status);
@@ -506,7 +506,20 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
        status =
            acpi_get_register(acpi_gbl_fixed_event_info[event].
-                              status_register_id, event_status);
+                              enable_register_id, &value);
+        if (ACPI_FAILURE(status))
+                return_ACPI_STATUS(status);
+        *event_status = value;
+        status =
+            acpi_get_register(acpi_gbl_fixed_event_info[event].
+                              status_register_id, &value);
+        if (ACPI_FAILURE(status))
+                return_ACPI_STATUS(status);
+        if (value)
+                *event_status |= ACPI_EVENT_FLAG_SET;
        return_ACPI_STATUS(status);
 }
@@ -566,7 +579,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
 }
 ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
-#endif                          /*  ACPI_FUTURE_USAGE  */
 /*******************************************************************************
 *
 * FUNCTION:    acpi_install_gpe_block
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 39d742190584..2a32c843cb4a 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("exconfig")
 /* Local prototypes */
 static acpi_status
-acpi_ex_add_table(acpi_native_uint table_index,
+acpi_ex_add_table(u32 table_index,
                  struct acpi_namespace_node *parent_node,
                  union acpi_operand_object **ddb_handle);
@@ -73,7 +73,7 @@ acpi_ex_add_table(acpi_native_uint table_index,
 ******************************************************************************/
 static acpi_status
-acpi_ex_add_table(acpi_native_uint table_index,
+acpi_ex_add_table(u32 table_index,
                  struct acpi_namespace_node *parent_node,
                  union acpi_operand_object **ddb_handle)
 {
@@ -96,7 +96,8 @@ acpi_ex_add_table(acpi_native_uint table_index,
        /* Install the new table into the local data structures */
-        obj_desc->reference.object = ACPI_CAST_PTR(void, table_index);
+        obj_desc->reference.object = ACPI_CAST_PTR(void,
+                        (unsigned long)table_index);
        /* Add the table to the namespace */
@@ -128,12 +129,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 {
        acpi_status status;
        union acpi_operand_object **operand = &walk_state->operands[0];
-        acpi_native_uint table_index;
        struct acpi_namespace_node *parent_node;
        struct acpi_namespace_node *start_node;
        struct acpi_namespace_node *parameter_node = NULL;
        union acpi_operand_object *ddb_handle;
        struct acpi_table_header *table;
+        u32 table_index;
        ACPI_FUNCTION_TRACE(ex_load_table_op);
@@ -280,7 +281,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 {
        union acpi_operand_object *ddb_handle;
        struct acpi_table_desc table_desc;
-        acpi_native_uint table_index;
+        u32 table_index;
        acpi_status status;
        u32 length;
@@ -437,7 +438,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
 {
        acpi_status status = AE_OK;
        union acpi_operand_object *table_desc = ddb_handle;
-        acpi_native_uint table_index;
+        u32 table_index;
        struct acpi_table_header *table;
        ACPI_FUNCTION_TRACE(ex_unload_table);
@@ -454,9 +455,9 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
-        /* Get the table index from the ddb_handle */
+        /* Get the table index from the ddb_handle (acpi_size for 64-bit case) */
-        table_index = (acpi_native_uint) table_desc->reference.object;
+        table_index = (u32) (acpi_size) table_desc->reference.object;
        /* Invoke table handler if present */
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index fd954b4ed83d..261d97516d9b 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -288,11 +288,11 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
                         u16 base, u8 * string, u8 data_width)
 {
        acpi_integer digit;
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
-        acpi_native_uint k = 0;
+        u32 k = 0;
-        acpi_native_uint hex_length;
+        u32 hex_length;
-        acpi_native_uint decimal_length;
+        u32 decimal_length;
        u32 remainder;
        u8 supress_zeros;
@@ -348,7 +348,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
                /* hex_length: 2 ascii hex chars per data byte */
-                hex_length = (acpi_native_uint) ACPI_MUL_2(data_width);
+                hex_length = ACPI_MUL_2(data_width);
                for (i = 0, j = (hex_length - 1); i < hex_length; i++, j--) {
                        /* Get one hex digit, most significant digits first */
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 60e62c4f0577..ad09696d5069 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -45,8 +45,6 @@
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
-#include <acpi/actables.h>
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 74f1b22601b3..2be2e2bf95bf 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -580,25 +580,22 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
        case ACPI_TYPE_BUFFER:
-                acpi_os_printf("Buffer len %X @ %p\n",
+                acpi_os_printf("Buffer length %.2X @ %p\n",
                               obj_desc->buffer.length,
                               obj_desc->buffer.pointer);
-                length = obj_desc->buffer.length;
-                if (length > 64) {
-                        length = 64;
-                }
                /* Debug only -- dump the buffer contents */
                if (obj_desc->buffer.pointer) {
-                        acpi_os_printf("Buffer Contents: ");
+                        length = obj_desc->buffer.length;
+                        if (length > 128) {
-                        for (index = 0; index < length; index++) {
+                                length = 128;
-                                acpi_os_printf(" %02x",
-                                               obj_desc->buffer.pointer[index]);
                        }
-                        acpi_os_printf("\n");
+                        acpi_os_printf
+                            ("Buffer Contents: (displaying length 0x%.2X)\n",
+                             length);
+                        ACPI_DUMP_BUFFER(obj_desc->buffer.pointer, length);
                }
                break;
@@ -756,54 +753,42 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 *
 * FUNCTION:    acpi_ex_dump_operands
 *
- * PARAMETERS:  Operands            - Operand list
+ * PARAMETERS:  Operands            - A list of Operand objects
- *              interpreter_mode    - Load or Exec
+ *              opcode_name         - AML opcode name
- *              Ident               - Identification
+ *              num_operands        - Operand count for this opcode
- *              num_levels          - # of stack entries to dump above line
- *              Note                - Output notation
- *              module_name         - Caller's module name
- *              line_number         - Caller's invocation line number
 *
- * DESCRIPTION: Dump the object stack
+ * DESCRIPTION: Dump the operands associated with the opcode
 *
 ******************************************************************************/
 void
 acpi_ex_dump_operands(union acpi_operand_object **operands,
-                      acpi_interpreter_mode interpreter_mode,
+                      const char *opcode_name, u32 num_operands)
-                      char *ident,
-                      u32 num_levels,
-                      char *note, char *module_name, u32 line_number)
 {
-        acpi_native_uint i;
        ACPI_FUNCTION_NAME(ex_dump_operands);
-        if (!ident) {
+        if (!opcode_name) {
-                ident = "?";
+                opcode_name = "UNKNOWN";
-        }
-        if (!note) {
-                note = "?";
        }
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "************* Operand Stack Contents (Opcode [%s], %d Operands)\n",
+                          "**** Start operand dump for opcode [%s], %d operands\n",
-                          ident, num_levels));
+                          opcode_name, num_operands));
-        if (num_levels == 0) {
+        if (num_operands == 0) {
-                num_levels = 1;
+                num_operands = 1;
        }
-        /* Dump the operand stack starting at the top */
+        /* Dump the individual operands */
-        for (i = 0; num_levels > 0; i--, num_levels--) {
+        while (num_operands) {
-                acpi_ex_dump_operand(operands[i], 0);
+                acpi_ex_dump_operand(*operands, 0);
+                operands++;
+                num_operands--;
        }
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "************* Operand Stack dump from %s(%d), %s\n",
+                          "**** End operand dump for [%s]\n", opcode_name));
-                          module_name, line_number, note));
        return;
 }
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index e336b5dc7a50..9ff9d1f4615d 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -153,14 +153,15 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                        /*
                         * Slack mode only:  We will go ahead and allow access to this
                         * field if it is within the region length rounded up to the next
-                         * access width boundary.
+                         * access width boundary. acpi_size cast for 64-bit compile.
                         */
                        if (ACPI_ROUND_UP(rgn_desc->region.length,
                                          obj_desc->common_field.
                                          access_byte_width) >=
-                            (obj_desc->common_field.base_byte_offset +
+                            ((acpi_size) obj_desc->common_field.
-                             (acpi_native_uint) obj_desc->common_field.
+                             base_byte_offset +
-                             access_byte_width + field_datum_byte_offset)) {
+                             obj_desc->common_field.access_byte_width +
+                             field_datum_byte_offset)) {
                                return_ACPI_STATUS(AE_OK);
                        }
                }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index cc956a5b5267..731414a581a6 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -329,8 +329,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                /* Result of two Strings is a String */
-                return_desc = acpi_ut_create_string_object((acpi_size)
+                return_desc = acpi_ut_create_string_object(((acpi_size)
-                                                           (operand0->string.
+                                                            operand0->string.
                                                            length +
                                                            local_operand1->
                                                            string.length));
@@ -352,8 +352,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                /* Result of two Buffers is a Buffer */
-                return_desc = acpi_ut_create_buffer_object((acpi_size)
+                return_desc = acpi_ut_create_buffer_object(((acpi_size)
-                                                           (operand0->buffer.
+                                                            operand0->buffer.
                                                            length +
                                                            local_operand1->
                                                            buffer.length));
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 3a2f8cd4c62a..5d438c32989d 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -503,11 +503,11 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 */
                second_desc = obj_desc->common.next_object;
                second_desc->extra.aml_start =
-                    ((union acpi_parse_object *)(info->data_register_node))->
+                    ACPI_CAST_PTR(union acpi_parse_object,
-                    named.data;
+                                  info->data_register_node)->named.data;
                second_desc->extra.aml_length =
-                    ((union acpi_parse_object *)(info->data_register_node))->
+                    ACPI_CAST_PTR(union acpi_parse_object,
-                    named.length;
+                                  info->data_register_node)->named.length;
                break;
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 7cd8bb54fa01..7a41c409ae4d 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -156,7 +156,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                /* Create a new mapping starting at the address given */
                mem_info->mapped_logical_address =
-                    acpi_os_map_memory((acpi_native_uint) address, window_size);
+                        acpi_os_map_memory((acpi_physical_address) address, window_size);
                if (!mem_info->mapped_logical_address) {
                        ACPI_ERROR((AE_INFO,
                                    "Could not map memory at %8.8X%8.8X, size %X",
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 73e29e566a70..54085f16ec28 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -698,5 +698,9 @@ acpi_ex_resolve_operands(u16 opcode,
                }
        }
+        ACPI_DUMP_OPERANDS(walk_state->operands,
+                           acpi_ps_get_opcode_name(opcode),
+                           walk_state->num_operands);
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 76c875bc3154..38b55e352495 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -343,12 +343,6 @@ acpi_ex_store(union acpi_operand_object *source_desc,
                            acpi_ut_get_object_type_name(dest_desc),
                            dest_desc));
-                ACPI_DUMP_STACK_ENTRY(source_desc);
-                ACPI_DUMP_STACK_ENTRY(dest_desc);
-                ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ExStore",
-                                   2,
-                                   "Target is not a Reference or Constant object");
                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
        }
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 6cf10cbc1eee..55c17afbe669 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -148,7 +148,7 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
        int result = 0;
        struct seq_file *m = file->private_data;
        struct acpi_device *device = m->private;
-        char state_string[12] = { '\0' };
+        char state_string[3] = { '\0' };
        if (count > sizeof(state_string) - 1)
                return -EINVAL;
@@ -157,6 +157,12 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
                return -EFAULT;
        state_string[count] = '\0';
+        if ((state_string[0] < '0') || (state_string[0] > '3'))
+                return -EINVAL;
+        if (state_string[1] == '\n')
+                state_string[1] = '\0';
+        if (state_string[1] != '\0')
+                return -EINVAL;
        result = acpi_bus_set_power(device->handle,
                                    simple_strtoul(state_string, NULL, 0));
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 9b227d4dc9c9..0f2dd81736bd 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -166,6 +166,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                "firmware_node");
                ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                "physical_node");
+                if (acpi_dev->wakeup.flags.valid)
+                        device_set_wakeup_capable(dev, true);
        }
        return 0;
@@ -336,6 +338,9 @@ static int __init acpi_rtc_init(void)
        if (acpi_disabled)
                return 0;
+        if (acpi_disabled)
+                return 0;
        if (dev) {
                rtc_wake_setup();
                rtc_info.wake_on = rtc_wake_on;
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 14bc4f456ae8..0b80db9d9197 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -55,6 +55,54 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 /******************************************************************************
 *
+ * FUNCTION:    acpi_hw_low_disable_gpe
+ *
+ * PARAMETERS:  gpe_event_info      - Info block for the GPE to be disabled
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Disable a single GPE in the enable register.
+ *
+ ******************************************************************************/
+acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+{
+        struct acpi_gpe_register_info *gpe_register_info;
+        acpi_status status;
+        u32 enable_mask;
+        /* Get the info block for the entire GPE register */
+        gpe_register_info = gpe_event_info->register_info;
+        if (!gpe_register_info) {
+                return (AE_NOT_EXIST);
+        }
+        /* Get current value of the enable register that contains this GPE */
+        status = acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH, &enable_mask,
+                                        &gpe_register_info->enable_address);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+        /* Clear just the bit that corresponds to this GPE */
+        ACPI_CLEAR_BIT(enable_mask,
+                       ((u32) 1 <<
+                        (gpe_event_info->gpe_number -
+                         gpe_register_info->base_gpe_number)));
+        /* Write the updated enable mask */
+        status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, enable_mask,
+                                         &gpe_register_info->enable_address);
+        return (status);
+}
+/******************************************************************************
+ *
 * FUNCTION:    acpi_hw_write_gpe_enable_reg
 *
 * PARAMETERS:  gpe_event_info      - Info block for the GPE to be enabled
@@ -68,7 +116,7 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 ******************************************************************************/
 acpi_status
-acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info *gpe_event_info)
+acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info * gpe_event_info)
 {
        struct acpi_gpe_register_info *gpe_register_info;
        acpi_status status;
@@ -138,7 +186,6 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
 *
 ******************************************************************************/
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
                       acpi_event_status * event_status)
@@ -198,7 +245,6 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
      unlock_and_exit:
        return (status);
 }
-#endif                          /*  ACPI_FUTURE_USAGE  */
 /******************************************************************************
 *
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 5445751b8a3e..0ab22004728a 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -73,7 +73,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
 void acpi_ns_print_pathname(u32 num_segments, char *pathname)
 {
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_NAME(ns_print_pathname);
@@ -515,12 +515,12 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                        if (obj_type > ACPI_TYPE_LOCAL_MAX) {
                                acpi_os_printf
-                                    ("(Ptr to ACPI Object type %X [UNKNOWN])\n",
+                                    ("(Pointer to ACPI Object type %.2X [UNKNOWN])\n",
                                     obj_type);
                                bytes_to_dump = 32;
                        } else {
                                acpi_os_printf
-                                    ("(Ptr to ACPI Object type %X [%s])\n",
+                                    ("(Pointer to ACPI Object type %.2X [%s])\n",
                                     obj_type, acpi_ut_get_type_name(obj_type));
                                bytes_to_dump =
                                    sizeof(union acpi_operand_object);
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 14bdfa92bea0..d369164e00b0 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -138,6 +138,41 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
                        return_ACPI_STATUS(AE_NULL_OBJECT);
                }
+                /*
+                 * Calculate the number of arguments being passed to the method
+                 */
+                info->param_count = 0;
+                if (info->parameters) {
+                        while (info->parameters[info->param_count])
+                                info->param_count++;
+                }
+                /* Error if too few arguments were passed in */
+                if (info->param_count < info->obj_desc->method.param_count) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Insufficient arguments - "
+                                    "method [%4.4s] needs %d, found %d",
+                                    acpi_ut_get_node_name(info->resolved_node),
+                                    info->obj_desc->method.param_count,
+                                    info->param_count));
+                        return_ACPI_STATUS(AE_MISSING_ARGUMENTS);
+                }
+                /* Just a warning if too many arguments */
+                else if (info->param_count >
+                                info->obj_desc->method.param_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Excess arguments - "
+                                      "method [%4.4s] needs %d, found %d",
+                                      acpi_ut_get_node_name(info->
+                                                            resolved_node),
+                                      info->obj_desc->method.param_count,
+                                      info->param_count));
+                }
                ACPI_DUMP_PATHNAME(info->resolved_node, "Execute Method:",
                                   ACPI_LV_INFO, _COMPONENT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 6d6d930c8e18..e4c57510d798 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -542,7 +542,6 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
        info->prefix_node = device_node;
        info->pathname = METHOD_NAME__INI;
        info->parameters = NULL;
-        info->parameter_type = ACPI_PARAM_ARGS;
        info->flags = ACPI_IGNORE_RETURN_VALUE;
        /*
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index 2c92f6cf5ce1..a4a412b7c029 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -71,8 +71,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
 ******************************************************************************/
 acpi_status
-acpi_ns_load_table(acpi_native_uint table_index,
+acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
-                   struct acpi_namespace_node *node)
 {
        acpi_status status;
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 46a79b0103b6..a82271a9dbb3 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -63,13 +63,13 @@ ACPI_MODULE_NAME("nsparse")
 *
 ******************************************************************************/
 acpi_status
-acpi_ns_one_complete_parse(acpi_native_uint pass_number,
+acpi_ns_one_complete_parse(u32 pass_number,
-                           acpi_native_uint table_index,
+                           u32 table_index,
-                           struct acpi_namespace_node * start_node)
+                           struct acpi_namespace_node *start_node)
 {
        union acpi_parse_object *parse_root;
        acpi_status status;
-        acpi_native_uint aml_length;
+       u32 aml_length;
        u8 *aml_start;
        struct acpi_walk_state *walk_state;
        struct acpi_table_header *table;
@@ -112,8 +112,8 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
                aml_start = (u8 *) table + sizeof(struct acpi_table_header);
                aml_length = table->length - sizeof(struct acpi_table_header);
                status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
-                                               aml_start, (u32) aml_length,
+                                               aml_start, aml_length, NULL,
-                                               NULL, (u8) pass_number);
+                                               (u8) pass_number);
        }
        if (ACPI_FAILURE(status)) {
@@ -158,8 +158,7 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
 ******************************************************************************/
 acpi_status
-acpi_ns_parse_table(acpi_native_uint table_index,
+acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
-                    struct acpi_namespace_node *start_node)
 {
        acpi_status status;
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 64c039843ed2..b0817e1127b1 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -73,9 +73,9 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 ******************************************************************************/
 void
-acpi_ns_report_error(char *module_name,
+acpi_ns_report_error(const char *module_name,
                     u32 line_number,
-                     char *internal_name, acpi_status lookup_status)
+                     const char *internal_name, acpi_status lookup_status)
 {
        acpi_status status;
        u32 bad_name;
@@ -130,11 +130,11 @@ acpi_ns_report_error(char *module_name,
 ******************************************************************************/
 void
-acpi_ns_report_method_error(char *module_name,
+acpi_ns_report_method_error(const char *module_name,
                            u32 line_number,
-                            char *message,
+                            const char *message,
                            struct acpi_namespace_node *prefix_node,
-                            char *path, acpi_status method_status)
+                            const char *path, acpi_status method_status)
 {
        acpi_status status;
        struct acpi_namespace_node *node = prefix_node;
@@ -167,7 +167,8 @@ acpi_ns_report_method_error(char *module_name,
 ******************************************************************************/
 void
-acpi_ns_print_node_pathname(struct acpi_namespace_node *node, char *message)
+acpi_ns_print_node_pathname(struct acpi_namespace_node *node,
+                            const char *message)
 {
        struct acpi_buffer buffer;
        acpi_status status;
@@ -296,7 +297,7 @@ u32 acpi_ns_local(acpi_object_type type)
 void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
 {
-        char *next_external_char;
+        const char *next_external_char;
        u32 i;
        ACPI_FUNCTION_ENTRY();
@@ -363,9 +364,9 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
 {
        u32 num_segments = info->num_segments;
        char *internal_name = info->internal_name;
-        char *external_name = info->next_external_char;
+        const char *external_name = info->next_external_char;
        char *result = NULL;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(ns_build_internal_name);
@@ -400,12 +401,11 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
                        result = &internal_name[i];
                } else if (num_segments == 2) {
                        internal_name[i] = AML_DUAL_NAME_PREFIX;
-                        result = &internal_name[(acpi_native_uint) (i + 1)];
+                        result = &internal_name[(acpi_size) i + 1];
                } else {
                        internal_name[i] = AML_MULTI_NAME_PREFIX_OP;
-                        internal_name[(acpi_native_uint) (i + 1)] =
+                        internal_name[(acpi_size) i + 1] = (char)num_segments;
-                            (char)num_segments;
+                        result = &internal_name[(acpi_size) i + 2];
-                        result = &internal_name[(acpi_native_uint) (i + 2)];
                }
        }
@@ -472,7 +472,8 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
 *
 *******************************************************************************/
-acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)
+acpi_status
+acpi_ns_internalize_name(const char *external_name, char **converted_name)
 {
        char *internal_name;
        struct acpi_namestring_info info;
@@ -528,15 +529,15 @@ acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)
 acpi_status
 acpi_ns_externalize_name(u32 internal_name_length,
-                         char *internal_name,
+                         const char *internal_name,
                         u32 * converted_name_length, char **converted_name)
 {
-        acpi_native_uint names_index = 0;
+        u32 names_index = 0;
-        acpi_native_uint num_segments = 0;
+        u32 num_segments = 0;
-        acpi_native_uint required_length;
+        u32 required_length;
-        acpi_native_uint prefix_length = 0;
+        u32 prefix_length = 0;
-        acpi_native_uint i = 0;
+        u32 i = 0;
-        acpi_native_uint j = 0;
+        u32 j = 0;
        ACPI_FUNCTION_TRACE(ns_externalize_name);
@@ -582,9 +583,8 @@ acpi_ns_externalize_name(u32 internal_name_length,
                        /* <count> 4-byte names */
                        names_index = prefix_length + 2;
-                        num_segments = (acpi_native_uint) (u8)
+                        num_segments = (u8)
-                            internal_name[(acpi_native_uint)
+                            internal_name[(acpi_size) prefix_length + 1];
-                                          (prefix_length + 1)];
                        break;
                case AML_DUAL_NAME_PREFIX:
@@ -823,7 +823,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
 acpi_status
 acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
-                 char *pathname,
+                 const char *pathname,
                 u32 flags, struct acpi_namespace_node **return_node)
 {
        union acpi_generic_state scope_info;
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index a8d549187c84..38be5865d95d 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -182,7 +182,6 @@ acpi_evaluate_object(acpi_handle handle,
        }
        info->pathname = pathname;
-        info->parameter_type = ACPI_PARAM_ARGS;
        /* Convert and validate the device handle */
@@ -442,7 +441,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
        u32 flags;
        struct acpica_device_id hid;
        struct acpi_compatible_id_list *cid;
-        acpi_native_uint i;
+        u32 i;
        int found;
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 658e5f3abae0..cb9864e39bae 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -120,10 +120,10 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
                        struct acpi_srat_mem_affinity *p =
                            (struct acpi_srat_mem_affinity *)header;
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "SRAT Memory (0x%lx length 0x%lx type 0x%x) in proximity domain %d %s%s\n",
+                                          "SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s\n",
                                          (unsigned long)p->base_address,
                                          (unsigned long)p->length,
-                                          p->memory_type, p->proximity_domain,
+                                          p->proximity_domain,
                                          (p->flags & ACPI_SRAT_MEM_ENABLED)?
                                          "enabled" : "disabled",
                                          (p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)?
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index e94463778845..d830b29b85b1 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -76,7 +76,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
 {
        u8 *aml = parser_state->aml;
        u32 package_length = 0;
-        acpi_native_uint byte_count;
+        u32 byte_count;
        u8 byte_zero_mask = 0x3F;       /* Default [0:5] */
        ACPI_FUNCTION_TRACE(ps_get_next_package_length);
@@ -86,7 +86,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
         * used to encode the package length, either 0,1,2, or 3
         */
        byte_count = (aml[0] >> 6);
-        parser_state->aml += (byte_count + 1);
+        parser_state->aml += ((acpi_size) byte_count + 1);
        /* Get bytes 3, 2, 1 as needed */
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 52581454c47c..270469aae842 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -333,9 +333,9 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 static void
 acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action)
 {
-        acpi_native_uint i;
+        u32 i;
-        if ((info->parameter_type == ACPI_PARAM_ARGS) && (info->parameters)) {
+        if (info->parameters) {
                /* Update reference count for each parameter */
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 89022a74faee..11acaee14d66 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -162,7 +162,7 @@ do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
                    !strcmp(prt->source, quirk->source) &&
                    strlen(prt->source) >= strlen(quirk->actual_source)) {
                        printk(KERN_WARNING PREFIX "firmware reports "
-                                "%04x:%02x:%02x[%c] connected to %s; "
+                                "%04x:%02x:%02x PCI INT %c connected to %s; "
                                "changing to %s\n",
                                entry->id.segment, entry->id.bus,
                                entry->id.device, 'A' + entry->pin,
@@ -429,7 +429,7 @@ acpi_pci_irq_derive(struct pci_dev *dev,
 {
        struct pci_dev *bridge = dev;
        int irq = -1;
-        u8 bridge_pin = 0;
+        u8 bridge_pin = 0, orig_pin = pin;
        if (!dev)
@@ -463,8 +463,8 @@ acpi_pci_irq_derive(struct pci_dev *dev,
        }
        if (irq < 0) {
-                printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",
+                dev_warn(&dev->dev, "can't derive routing for PCI INT %c\n",
-                              pci_name(dev));
+                         'A' + orig_pin);
                return -1;
        }
@@ -487,6 +487,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        int triggering = ACPI_LEVEL_SENSITIVE;
        int polarity = ACPI_ACTIVE_LOW;
        char *link = NULL;
+        char link_desc[16];
        int rc;
@@ -503,7 +504,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        pin--;
        if (!dev->bus) {
-                printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");
+                dev_err(&dev->dev, "invalid (NULL) 'bus' field\n");
                return -ENODEV;
        }
@@ -538,8 +539,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
         * driver reported one, then use it. Exit in any case.
         */
        if (irq < 0) {
-                printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",
+                dev_warn(&dev->dev, "PCI INT %c: no GSI", 'A' + pin);
-                       pci_name(dev), ('A' + pin));
                /* Interrupt Line values above 0xF are forbidden */
                if (dev->irq > 0 && (dev->irq <= 0xF)) {
                        printk(" - using IRQ %d\n", dev->irq);
@@ -554,21 +554,21 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        rc = acpi_register_gsi(irq, triggering, polarity);
        if (rc < 0) {
-                printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "
+                dev_warn(&dev->dev, "PCI INT %c: failed to register GSI\n",
-                       "to register GSI\n", pci_name(dev), ('A' + pin));
+                         'A' + pin);
                return rc;
        }
        dev->irq = rc;
-        printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
-               pci_name(dev), 'A' + pin);
        if (link)
-                printk("Link [%s] -> ", link);
+                snprintf(link_desc, sizeof(link_desc), " -> Link[%s]", link);
+        else
+                link_desc[0] = '\0';
-        printk("GSI %u (%s, %s) -> IRQ %d\n", irq,
+        dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
-               (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
+                 'A' + pin, link_desc, irq,
-               (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
+                 (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
+                 (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
        return 0;
 }
@@ -616,10 +616,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
         * (e.g. PCI_UNDEFINED_IRQ).
         */
-        printk(KERN_INFO PREFIX "PCI interrupt for device %s disabled\n",
+        dev_info(&dev->dev, "PCI INT %c disabled\n", 'A' + pin);
-               pci_name(dev));
        acpi_unregister_gsi(gsi);
-        return;
 }
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
new file mode 100644
index 000000000000..b9ab030a52d5
--- /dev/null
+++ b/drivers/acpi/pci_slot.c
@@ -0,0 +1,368 @@
+/*
+ *  pci_slot.c - ACPI PCI Slot Driver
+ *
+ *  The code here is heavily leveraged from the acpiphp module.
+ *  Thanks to Matthew Wilcox <matthew@wil.cx> for much guidance.
+ *  Thanks to Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> for code
+ *  review and fixes.
+ *
+ *  Copyright (C) 2007 Alex Chiang <achiang@hp.com>
+ *  Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms and conditions of the GNU General Public License,
+ *  version 2, as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+static int debug;
+static int check_sta_before_sun;
+#define DRIVER_VERSION  "0.1"
+#define DRIVER_AUTHOR   "Alex Chiang <achiang@hp.com>"
+#define DRIVER_DESC     "ACPI PCI Slot Detection Driver"
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
+module_param(debug, bool, 0644);
+#define _COMPONENT              ACPI_PCI_COMPONENT
+ACPI_MODULE_NAME("pci_slot");
+#define MY_NAME "pci_slot"
+#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
+#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
+#define dbg(format, arg...)                                     \
+        do {                                                    \
+                if (debug)                                      \
+                        printk(KERN_DEBUG "%s: " format,        \
+                                MY_NAME , ## arg);              \
+        } while (0)
+#define SLOT_NAME_SIZE 20               /* Inspired by #define in acpiphp.h */
+struct acpi_pci_slot {
+        acpi_handle root_handle;        /* handle of the root bridge */
+        struct pci_slot *pci_slot;      /* corresponding pci_slot */
+        struct list_head list;          /* node in the list of slots */
+};
+static int acpi_pci_slot_add(acpi_handle handle);
+static void acpi_pci_slot_remove(acpi_handle handle);
+static LIST_HEAD(slot_list);
+static DEFINE_MUTEX(slot_list_lock);
+static struct acpi_pci_driver acpi_pci_slot_driver = {
+        .add = acpi_pci_slot_add,
+        .remove = acpi_pci_slot_remove,
+};
+static int
+check_slot(acpi_handle handle, int *device, unsigned long *sun)
+{
+        int retval = 0;
+        unsigned long adr, sta;
+        acpi_status status;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+        dbg("Checking slot on path: %s\n", (char *)buffer.pointer);
+        if (check_sta_before_sun) {
+                /* If SxFy doesn't have _STA, we just assume it's there */
+                status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+                if (ACPI_SUCCESS(status) && !(sta & ACPI_STA_DEVICE_PRESENT)) {
+                        retval = -1;
+                        goto out;
+                }
+        }
+        status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
+        if (ACPI_FAILURE(status)) {
+                dbg("_ADR returned %d on %s\n", status, (char *)buffer.pointer);
+                retval = -1;
+                goto out;
+        }
+        *device = (adr >> 16) & 0xffff;
+        /* No _SUN == not a slot == bail */
+        status = acpi_evaluate_integer(handle, "_SUN", NULL, sun);
+        if (ACPI_FAILURE(status)) {
+                dbg("_SUN returned %d on %s\n", status, (char *)buffer.pointer);
+                retval = -1;
+                goto out;
+        }
+out:
+        kfree(buffer.pointer);
+        return retval;
+}
+struct callback_args {
+        acpi_walk_callback      user_function;  /* only for walk_p2p_bridge */
+        struct pci_bus          *pci_bus;
+        acpi_handle             root_handle;
+};
+/*
+ * register_slot
+ *
+ * Called once for each SxFy object in the namespace. Don't worry about
+ * calling pci_create_slot multiple times for the same pci_bus:device,
+ * since each subsequent call simply bumps the refcount on the pci_slot.
+ *
+ * The number of calls to pci_destroy_slot from unregister_slot is
+ * symmetrical.
+ */
+static acpi_status
+register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        int device;
+        unsigned long sun;
+        char name[SLOT_NAME_SIZE];
+        struct acpi_pci_slot *slot;
+        struct pci_slot *pci_slot;
+        struct callback_args *parent_context = context;
+        struct pci_bus *pci_bus = parent_context->pci_bus;
+        if (check_slot(handle, &device, &sun))
+                return AE_OK;
+        slot = kmalloc(sizeof(*slot), GFP_KERNEL);
+        if (!slot) {
+                err("%s: cannot allocate memory\n", __func__);
+                return AE_OK;
+        }
+        snprintf(name, sizeof(name), "%u", (u32)sun);
+        pci_slot = pci_create_slot(pci_bus, device, name);
+        if (IS_ERR(pci_slot)) {
+                err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
+                kfree(slot);
+        }
+        slot->root_handle = parent_context->root_handle;
+        slot->pci_slot = pci_slot;
+        INIT_LIST_HEAD(&slot->list);
+        mutex_lock(&slot_list_lock);
+        list_add(&slot->list, &slot_list);
+        mutex_unlock(&slot_list_lock);
+        dbg("pci_slot: %p, pci_bus: %x, device: %d, name: %s\n",
+                pci_slot, pci_bus->number, device, name);
+        return AE_OK;
+}
+/*
+ * walk_p2p_bridge - discover and walk p2p bridges
+ * @handle: points to an acpi_pci_root
+ * @context: p2p_bridge_context pointer
+ *
+ * Note that when we call ourselves recursively, we pass a different
+ * value of pci_bus in the child_context.
+ */
+static acpi_status
+walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        int device, function;
+        unsigned long adr;
+        acpi_status status;
+        acpi_handle dummy_handle;
+        acpi_walk_callback user_function;
+        struct pci_dev *dev;
+        struct pci_bus *pci_bus;
+        struct callback_args child_context;
+        struct callback_args *parent_context = context;
+        pci_bus = parent_context->pci_bus;
+        user_function = parent_context->user_function;
+        status = acpi_get_handle(handle, "_ADR", &dummy_handle);
+        if (ACPI_FAILURE(status))
+                return AE_OK;
+        status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
+        if (ACPI_FAILURE(status))
+                return AE_OK;
+        device = (adr >> 16) & 0xffff;
+        function = adr & 0xffff;
+        dev = pci_get_slot(pci_bus, PCI_DEVFN(device, function));
+        if (!dev || !dev->subordinate)
+                goto out;
+        child_context.pci_bus = dev->subordinate;
+        child_context.user_function = user_function;
+        child_context.root_handle = parent_context->root_handle;
+        dbg("p2p bridge walk, pci_bus = %x\n", dev->subordinate->number);
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,
+                                     user_function, &child_context, NULL);
+        if (ACPI_FAILURE(status))
+                goto out;
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,
+                                     walk_p2p_bridge, &child_context, NULL);
+out:
+        pci_dev_put(dev);
+        return AE_OK;
+}
+/*
+ * walk_root_bridge - generic root bridge walker
+ * @handle: points to an acpi_pci_root
+ * @user_function: user callback for slot objects
+ *
+ * Call user_function for all objects underneath this root bridge.
+ * Walk p2p bridges underneath us and call user_function on those too.
+ */
+static int
+walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function)
+{
+        int seg, bus;
+        unsigned long tmp;
+        acpi_status status;
+        acpi_handle dummy_handle;
+        struct pci_bus *pci_bus;
+        struct callback_args context;
+        /* If the bridge doesn't have _STA, we assume it is always there */
+        status = acpi_get_handle(handle, "_STA", &dummy_handle);
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_evaluate_integer(handle, "_STA", NULL, &tmp);
+                if (ACPI_FAILURE(status)) {
+                        info("%s: _STA evaluation failure\n", __func__);
+                        return 0;
+                }
+                if ((tmp & ACPI_STA_DEVICE_FUNCTIONING) == 0)
+                        /* don't register this object */
+                        return 0;
+        }
+        status = acpi_evaluate_integer(handle, "_SEG", NULL, &tmp);
+        seg = ACPI_SUCCESS(status) ? tmp : 0;
+        status = acpi_evaluate_integer(handle, "_BBN", NULL, &tmp);
+        bus = ACPI_SUCCESS(status) ? tmp : 0;
+        pci_bus = pci_find_bus(seg, bus);
+        if (!pci_bus)
+                return 0;
+        context.pci_bus = pci_bus;
+        context.user_function = user_function;
+        context.root_handle = handle;
+        dbg("root bridge walk, pci_bus = %x\n", pci_bus->number);
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,
+                                     user_function, &context, NULL);
+        if (ACPI_FAILURE(status))
+                return status;
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,
+                                     walk_p2p_bridge, &context, NULL);
+        if (ACPI_FAILURE(status))
+                err("%s: walk_p2p_bridge failure - %d\n", __func__, status);
+        return status;
+}
+/*
+ * acpi_pci_slot_add
+ * @handle: points to an acpi_pci_root
+ */
+static int
+acpi_pci_slot_add(acpi_handle handle)
+{
+        acpi_status status;
+        status = walk_root_bridge(handle, register_slot);
+        if (ACPI_FAILURE(status))
+                err("%s: register_slot failure - %d\n", __func__, status);
+        return status;
+}
+/*
+ * acpi_pci_slot_remove
+ * @handle: points to an acpi_pci_root
+ */
+static void
+acpi_pci_slot_remove(acpi_handle handle)
+{
+        struct acpi_pci_slot *slot, *tmp;
+        mutex_lock(&slot_list_lock);
+        list_for_each_entry_safe(slot, tmp, &slot_list, list) {
+                if (slot->root_handle == handle) {
+                        list_del(&slot->list);
+                        pci_destroy_slot(slot->pci_slot);
+                        kfree(slot);
+                }
+        }
+        mutex_unlock(&slot_list_lock);
+}
+static int do_sta_before_sun(const struct dmi_system_id *d)
+{
+        info("%s detected: will evaluate _STA before calling _SUN\n", d->ident);
+        check_sta_before_sun = 1;
+        return 0;
+}
+static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
+        /*
+         * Fujitsu Primequest machines will return 1023 to indicate an
+         * error if the _SUN method is evaluated on SxFy objects that
+         * are not present (as indicated by _STA), so for those machines,
+         * we want to check _STA before evaluating _SUN.
+         */
+        {
+         .callback = do_sta_before_sun,
+         .ident = "Fujitsu PRIMEQUEST",
+         .matches = {
+                DMI_MATCH(DMI_BIOS_VENDOR, "FUJITSU LIMITED"),
+                DMI_MATCH(DMI_BIOS_VERSION, "PRIMEQUEST"),
+                },
+        },
+        {}
+};
+static int __init
+acpi_pci_slot_init(void)
+{
+        dmi_check_system(acpi_pci_slot_dmi_table);
+        acpi_pci_register_driver(&acpi_pci_slot_driver);
+        return 0;
+}
+static void __exit
+acpi_pci_slot_exit(void)
+{
+        acpi_pci_unregister_driver(&acpi_pci_slot_driver);
+}
+module_init(acpi_pci_slot_init);
+module_exit(acpi_pci_slot_exit);
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 81e4f081a4ae..4ab21cb1c8c7 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -292,69 +292,135 @@ static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
        return 0;
 }
+/**
+ * acpi_device_sleep_wake - execute _DSW (Device Sleep Wake) or (deprecated in
+ *                          ACPI 3.0) _PSW (Power State Wake)
+ * @dev: Device to handle.
+ * @enable: 0 - disable, 1 - enable the wake capabilities of the device.
+ * @sleep_state: Target sleep state of the system.
+ * @dev_state: Target power state of the device.
+ *
+ * Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power
+ * State Wake) for the device, if present.  On failure reset the device's
+ * wakeup.flags.valid flag.
+ *
+ * RETURN VALUE:
+ * 0 if either _DSW or _PSW has been successfully executed
+ * 0 if neither _DSW nor _PSW has been found
+ * -ENODEV if the execution of either _DSW or _PSW has failed
+ */
+int acpi_device_sleep_wake(struct acpi_device *dev,
+                           int enable, int sleep_state, int dev_state)
+{
+        union acpi_object in_arg[3];
+        struct acpi_object_list arg_list = { 3, in_arg };
+        acpi_status status = AE_OK;
+        /*
+         * Try to execute _DSW first.
+         *
+         * Three agruments are needed for the _DSW object:
+         * Argument 0: enable/disable the wake capabilities
+         * Argument 1: target system state
+         * Argument 2: target device state
+         * When _DSW object is called to disable the wake capabilities, maybe
+         * the first argument is filled. The values of the other two agruments
+         * are meaningless.
+         */
+        in_arg[0].type = ACPI_TYPE_INTEGER;
+        in_arg[0].integer.value = enable;
+        in_arg[1].type = ACPI_TYPE_INTEGER;
+        in_arg[1].integer.value = sleep_state;
+        in_arg[2].type = ACPI_TYPE_INTEGER;
+        in_arg[2].integer.value = dev_state;
+        status = acpi_evaluate_object(dev->handle, "_DSW", &arg_list, NULL);
+        if (ACPI_SUCCESS(status)) {
+                return 0;
+        } else if (status != AE_NOT_FOUND) {
+                printk(KERN_ERR PREFIX "_DSW execution failed\n");
+                dev->wakeup.flags.valid = 0;
+                return -ENODEV;
+        }
+        /* Execute _PSW */
+        arg_list.count = 1;
+        in_arg[0].integer.value = enable;
+        status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);
+        if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
+                printk(KERN_ERR PREFIX "_PSW execution failed\n");
+                dev->wakeup.flags.valid = 0;
+                return -ENODEV;
+        }
+        return 0;
+}
 /*
 * Prepare a wakeup device, two steps (Ref ACPI 2.0:P229):
 * 1. Power on the power resources required for the wakeup device 
- * 2. Enable _PSW (power state wake) for the device if present
+ * 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power
+ *    State Wake) for the device, if present
 */
-int acpi_enable_wakeup_device_power(struct acpi_device *dev)
+int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state)
 {
-        union acpi_object arg = { ACPI_TYPE_INTEGER };
+        int i, err;
-        struct acpi_object_list arg_list = { 1, &arg };
-        acpi_status status = AE_OK;
-        int i;
-        int ret = 0;
        if (!dev || !dev->wakeup.flags.valid)
-                return -1;
+                return -EINVAL;
+        /*
+         * Do not execute the code below twice in a row without calling
+         * acpi_disable_wakeup_device_power() in between for the same device
+         */
+        if (dev->wakeup.flags.prepared)
+                return 0;
-        arg.integer.value = 1;
        /* Open power resource */
        for (i = 0; i < dev->wakeup.resources.count; i++) {
-                ret = acpi_power_on(dev->wakeup.resources.handles[i], dev);
+                int ret = acpi_power_on(dev->wakeup.resources.handles[i], dev);
                if (ret) {
                        printk(KERN_ERR PREFIX "Transition power state\n");
                        dev->wakeup.flags.valid = 0;
-                        return -1;
+                        return -ENODEV;
                }
        }
-        /* Execute PSW */
+        /*
-        status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);
+         * Passing 3 as the third argument below means the device may be placed
-        if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
+         * in arbitrary power state afterwards.
-                printk(KERN_ERR PREFIX "Evaluate _PSW\n");
+         */
-                dev->wakeup.flags.valid = 0;
+        err = acpi_device_sleep_wake(dev, 1, sleep_state, 3);
-                ret = -1;
+        if (!err)
-        }
+                dev->wakeup.flags.prepared = 1;
-        return ret;
+        return err;
 }
 /*
 * Shutdown a wakeup device, counterpart of above method
- * 1. Disable _PSW (power state wake)
+ * 1. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power
+ *    State Wake) for the device, if present
 * 2. Shutdown down the power resources
 */
 int acpi_disable_wakeup_device_power(struct acpi_device *dev)
 {
-        union acpi_object arg = { ACPI_TYPE_INTEGER };
+        int i, ret;
-        struct acpi_object_list arg_list = { 1, &arg };
-        acpi_status status = AE_OK;
-        int i;
-        int ret = 0;
        if (!dev || !dev->wakeup.flags.valid)
-                return -1;
+                return -EINVAL;
-        arg.integer.value = 0;
+        /*
-        /* Execute PSW */
+         * Do not execute the code below twice in a row without calling
-        status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);
+         * acpi_enable_wakeup_device_power() in between for the same device
-        if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
+         */
-                printk(KERN_ERR PREFIX "Evaluate _PSW\n");
+        if (!dev->wakeup.flags.prepared)
-                dev->wakeup.flags.valid = 0;
+                return 0;
-                return -1;
-        }
+        dev->wakeup.flags.prepared = 0;
+        ret = acpi_device_sleep_wake(dev, 0, 0, 0);
+        if (ret)
+                return ret;
        /* Close power resource */
        for (i = 0; i < dev->wakeup.resources.count; i++) {
@@ -362,7 +428,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
                if (ret) {
                        printk(KERN_ERR PREFIX "Transition power state\n");
                        dev->wakeup.flags.valid = 0;
-                        return -1;
+                        return -ENODEV;
                }
        }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9dd0fa93b9e1..ec0f2d581ece 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -118,8 +118,31 @@ static const struct file_operations acpi_processor_info_fops = {
        .release = single_release,
 };
-struct acpi_processor *processors[NR_CPUS];
+DEFINE_PER_CPU(struct acpi_processor *, processors);
 struct acpi_processor_errata errata __read_mostly;
+static int set_no_mwait(const struct dmi_system_id *id)
+{
+        printk(KERN_NOTICE PREFIX "%s detected - "
+                "disable mwait for CPU C-stetes\n", id->ident);
+        idle_nomwait = 1;
+        return 0;
+}
+static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
+        {
+        set_no_mwait, "IFL91 board", {
+        DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
+        DMI_MATCH(DMI_SYS_VENDOR, "ZEPTO"),
+        DMI_MATCH(DMI_PRODUCT_VERSION, "3215W"),
+        DMI_MATCH(DMI_BOARD_NAME, "IFL91") }, NULL},
+        {
+        set_no_mwait, "Extensa 5220", {
+        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
+        DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+        DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
+        DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},
+        {},
+};
 /* --------------------------------------------------------------------------
                                Errata Handling
@@ -265,7 +288,20 @@ static int acpi_processor_set_pdc(struct acpi_processor *pr)
        if (!pdc_in)
                return status;
+        if (idle_nomwait) {
+                /*
+                 * If mwait is disabled for CPU C-states, the C2C3_FFH access
+                 * mode will be disabled in the parameter of _PDC object.
+                 * Of course C1_FFH access mode will also be disabled.
+                 */
+                union acpi_object *obj;
+                u32 *buffer = NULL;
+                obj = pdc_in->pointer;
+                buffer = (u32 *)(obj->buffer.pointer);
+                buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
+        }
        status = acpi_evaluate_object(pr->handle, "_PDC", pdc_in, NULL);
        if (ACPI_FAILURE(status))
@@ -614,14 +650,14 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
        return 0;
 }
-static void *processor_device_array[NR_CPUS];
+static DEFINE_PER_CPU(void *, processor_device_array);
 static int __cpuinit acpi_processor_start(struct acpi_device *device)
 {
        int result = 0;
        acpi_status status = AE_OK;
        struct acpi_processor *pr;
+        struct sys_device *sysdev;
        pr = acpi_driver_data(device);
@@ -638,20 +674,24 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
         * ACPI id of processors can be reported wrongly by the BIOS.
         * Don't trust it blindly
         */
-        if (processor_device_array[pr->id] != NULL &&
+        if (per_cpu(processor_device_array, pr->id) != NULL &&
-            processor_device_array[pr->id] != device) {
+            per_cpu(processor_device_array, pr->id) != device) {
                printk(KERN_WARNING "BIOS reported wrong ACPI id "
                        "for the processor\n");
                return -ENODEV;
        }
-        processor_device_array[pr->id] = device;
+        per_cpu(processor_device_array, pr->id) = device;
-        processors[pr->id] = pr;
+        per_cpu(processors, pr->id) = pr;
        result = acpi_processor_add_fs(device);
        if (result)
                goto end;
+        sysdev = get_cpu_sysdev(pr->id);
+        if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev"))
+                return -EFAULT;
        status = acpi_install_notify_handler(pr->handle, ACPI_DEVICE_NOTIFY,
                                             acpi_processor_notify, pr);
@@ -749,7 +789,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
                unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;
-        struct acpi_processor *pr = processors[cpu];
+        struct acpi_processor *pr = per_cpu(processors, cpu);
        if (action == CPU_ONLINE && pr) {
                acpi_processor_ppc_has_changed(pr);
@@ -810,6 +850,8 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
        status = acpi_remove_notify_handler(pr->handle, ACPI_DEVICE_NOTIFY,
                                            acpi_processor_notify);
+        sysfs_remove_link(&device->dev.kobj, "sysdev");
        acpi_processor_remove_fs(device);
        if (pr->cdev) {
@@ -819,8 +861,8 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
                pr->cdev = NULL;
        }
-        processors[pr->id] = NULL;
+        per_cpu(processors, pr->id) = NULL;
-        processor_device_array[pr->id] = NULL;
+        per_cpu(processor_device_array, pr->id) = NULL;
        kfree(pr);
        return 0;
@@ -1014,9 +1056,9 @@ static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
 static int acpi_processor_handle_eject(struct acpi_processor *pr)
 {
-        if (cpu_online(pr->id)) {
+        if (cpu_online(pr->id))
-                return (-EINVAL);
+                cpu_down(pr->id);
-        }
        arch_unregister_cpu(pr->id);
        acpi_unmap_lsapic(pr->id);
        return (0);
@@ -1068,8 +1110,6 @@ static int __init acpi_processor_init(void)
 {
        int result = 0;
-        memset(&processors, 0, sizeof(processors));
        memset(&errata, 0, sizeof(errata));
 #ifdef CONFIG_SMP
@@ -1083,6 +1123,11 @@ static int __init acpi_processor_init(void)
                return -ENOMEM;
        acpi_processor_dir->owner = THIS_MODULE;
+        /*
+         * Check whether the system is DMI table. If yes, OSPM
+         * should not use mwait for CPU-states.
+         */
+        dmi_check_system(processor_idle_dmi_table);
        result = cpuidle_register_driver(&acpi_idle_driver);
        if (result < 0)
                goto out_proc;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 4976e5db2b3f..d592dbb1d12a 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -41,6 +41,7 @@
 #include <linux/pm_qos_params.h>
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
+#include <linux/cpuidle.h>
 /*
 * Include the apic definitions for x86 to have the APIC timer related defines
@@ -57,6 +58,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/processor.h>
+#include <asm/processor.h>
 #define ACPI_PROCESSOR_COMPONENT        0x01000000
 #define ACPI_PROCESSOR_CLASS            "processor"
@@ -401,7 +403,7 @@ static void acpi_processor_idle(void)
         */
        local_irq_disable();
-        pr = processors[smp_processor_id()];
+        pr = __get_cpu_var(processors);
        if (!pr) {
                local_irq_enable();
                return;
@@ -955,6 +957,21 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                        } else {
                                continue;
                        }
+                        if (cx.type == ACPI_STATE_C1 &&
+                                        (idle_halt || idle_nomwait)) {
+                                /*
+                                 * In most cases the C1 space_id obtained from
+                                 * _CST object is FIXED_HARDWARE access mode.
+                                 * But when the option of idle=halt is added,
+                                 * the entry_method type should be changed from
+                                 * CSTATE_FFH to CSTATE_HALT.
+                                 * When the option of idle=nomwait is added,
+                                 * the C1 entry_method type should be
+                                 * CSTATE_HALT.
+                                 */
+                                cx.entry_method = ACPI_CSTATE_HALT;
+                                snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI HLT");
+                        }
                } else {
                        snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI IOPORT 0x%x",
                                 cx.address);
@@ -1431,7 +1448,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
        struct acpi_processor *pr;
        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
-        pr = processors[smp_processor_id()];
+        pr = __get_cpu_var(processors);
        if (unlikely(!pr))
                return 0;
@@ -1471,7 +1488,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
        u32 t1, t2;
        int sleep_ticks = 0;
-        pr = processors[smp_processor_id()];
+        pr = __get_cpu_var(processors);
        if (unlikely(!pr))
                return 0;
@@ -1549,7 +1566,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
        u32 t1, t2;
        int sleep_ticks = 0;
-        pr = processors[smp_processor_id()];
+        pr = __get_cpu_var(processors);
        if (unlikely(!pr))
                return 0;
@@ -1780,6 +1797,15 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                return 0;
        if (!first_run) {
+                if (idle_halt) {
+                        /*
+                         * When the boot option of "idle=halt" is added, halt
+                         * is used for CPU IDLE.
+                         * In such case C2/C3 is meaningless. So the max_cstate
+                         * is set to one.
+                         */
+                        max_cstate = 1;
+                }
                dmi_check_system(processor_power_dmi_table);
                max_cstate = acpi_processor_cstate_check(max_cstate);
                if (max_cstate < ACPI_C_STATES_MAX)
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index d80b2d1441af..b4749969c6b4 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -89,7 +89,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,
        if (event != CPUFREQ_INCOMPATIBLE)
                goto out;
-        pr = processors[policy->cpu];
+        pr = per_cpu(processors, policy->cpu);
        if (!pr || !pr->performance)
                goto out;
@@ -572,7 +572,7 @@ int acpi_processor_preregister_performance(
        /* Call _PSD for all CPUs */
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr) {
                        /* Look only at processors in ACPI namespace */
                        continue;
@@ -603,7 +603,7 @@ int acpi_processor_preregister_performance(
         * domain info.
         */
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr)
                        continue;
@@ -624,7 +624,7 @@ int acpi_processor_preregister_performance(
        cpus_clear(covered_cpus);
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr)
                        continue;
@@ -651,7 +651,7 @@ int acpi_processor_preregister_performance(
                        if (i == j)
                                continue;
-                        match_pr = processors[j];
+                        match_pr = per_cpu(processors, j);
                        if (!match_pr)
                                continue;
@@ -680,7 +680,7 @@ int acpi_processor_preregister_performance(
                        if (i == j)
                                continue;
-                        match_pr = processors[j];
+                        match_pr = per_cpu(processors, j);
                        if (!match_pr)
                                continue;
@@ -697,7 +697,7 @@ int acpi_processor_preregister_performance(
 err_ret:
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr || !pr->performance)
                        continue;
@@ -728,7 +728,7 @@ acpi_processor_register_performance(struct acpi_processor_performance
        mutex_lock(&performance_mutex);
-        pr = processors[cpu];
+        pr = per_cpu(processors, cpu);
        if (!pr) {
                mutex_unlock(&performance_mutex);
                return -ENODEV;
@@ -766,7 +766,7 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
        mutex_lock(&performance_mutex);
-        pr = processors[cpu];
+        pr = per_cpu(processors, cpu);
        if (!pr) {
                mutex_unlock(&performance_mutex);
                return;
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 28509fbba6f9..a56fc6c4394b 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -71,7 +71,7 @@ static int acpi_processor_update_tsd_coord(void)
         * coordination between all CPUs.
         */
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr)
                        continue;
@@ -93,7 +93,7 @@ static int acpi_processor_update_tsd_coord(void)
        cpus_clear(covered_cpus);
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr)
                        continue;
@@ -119,7 +119,7 @@ static int acpi_processor_update_tsd_coord(void)
                        if (i == j)
                                continue;
-                        match_pr = processors[j];
+                        match_pr = per_cpu(processors, j);
                        if (!match_pr)
                                continue;
@@ -152,7 +152,7 @@ static int acpi_processor_update_tsd_coord(void)
                        if (i == j)
                                continue;
-                        match_pr = processors[j];
+                        match_pr = per_cpu(processors, j);
                        if (!match_pr)
                                continue;
@@ -172,7 +172,7 @@ static int acpi_processor_update_tsd_coord(void)
 err_ret:
        for_each_possible_cpu(i) {
-                pr = processors[i];
+                pr = per_cpu(processors, i);
                if (!pr)
                        continue;
@@ -214,7 +214,7 @@ static int acpi_processor_throttling_notifier(unsigned long event, void *data)
        struct acpi_processor_throttling *p_throttling;
        cpu = p_tstate->cpu;
-        pr = processors[cpu];
+        pr = per_cpu(processors, cpu);
        if (!pr) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Invalid pr pointer\n"));
                return 0;
@@ -1035,7 +1035,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
                 * cpus.
                 */
                for_each_cpu_mask_nr(i, online_throttling_cpus) {
-                        match_pr = processors[i];
+                        match_pr = per_cpu(processors, i);
                        /*
                         * If the pointer is invalid, we will report the
                         * error message and continue.
@@ -1232,7 +1232,10 @@ static ssize_t acpi_processor_write_throttling(struct file *file,
        int result = 0;
        struct seq_file *m = file->private_data;
        struct acpi_processor *pr = m->private;
-        char state_string[12] = { '\0' };
+        char state_string[5] = "";
+        char *charp = NULL;
+        size_t state_val = 0;
+        char tmpbuf[5] = "";
        if (!pr || (count > sizeof(state_string) - 1))
                return -EINVAL;
@@ -1241,10 +1244,23 @@ static ssize_t acpi_processor_write_throttling(struct file *file,
                return -EFAULT;
        state_string[count] = '\0';
+        if ((count > 0) && (state_string[count-1] == '\n'))
+                state_string[count-1] = '\0';
-        result = acpi_processor_set_throttling(pr,
+        charp = state_string;
-                                               simple_strtoul(state_string,
+        if ((state_string[0] == 't') || (state_string[0] == 'T'))
-                                                              NULL, 0));
+                charp++;
+        state_val = simple_strtoul(charp, NULL, 0);
+        if (state_val >= pr->throttling.state_count)
+                return -EINVAL;
+        snprintf(tmpbuf, 5, "%zu", state_val);
+        if (strcmp(tmpbuf, charp) != 0)
+                return -EINVAL;
+        result = acpi_processor_set_throttling(pr, state_val);
        if (result)
                return result;
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
new file mode 100644
index 000000000000..a6b662c00b67
--- /dev/null
+++ b/drivers/acpi/reboot.c
@@ -0,0 +1,50 @@
+#include <linux/pci.h>
+#include <linux/acpi.h>
+#include <acpi/reboot.h>
+void acpi_reboot(void)
+{
+        struct acpi_generic_address *rr;
+        struct pci_bus *bus0;
+        u8 reset_value;
+        unsigned int devfn;
+        if (acpi_disabled)
+                return;
+        rr = &acpi_gbl_FADT.reset_register;
+        /* Is the reset register supported? */
+        if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
+            rr->bit_width != 8 || rr->bit_offset != 0)
+                return;
+        reset_value = acpi_gbl_FADT.reset_value;
+        /* The reset register can only exist in I/O, Memory or PCI config space
+         * on a device on bus 0. */
+        switch (rr->space_id) {
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+                /* The reset register can only live on bus 0. */
+                bus0 = pci_find_bus(0, 0);
+                if (!bus0)
+                        return;
+                /* Form PCI device/function pair. */
+                devfn = PCI_DEVFN((rr->address >> 32) & 0xffff,
+                                  (rr->address >> 16) & 0xffff);
+                printk(KERN_DEBUG "Resetting with ACPI PCI RESET_REG.");
+                /* Write the value that resets us. */
+                pci_bus_write_config_byte(bus0, devfn,
+                                (rr->address & 0xffff), reset_value);
+                break;
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n");
+                acpi_hw_low_level_write(8, reset_value, rr);
+                break;
+        }
+        /* Wait ten seconds */
+        acpi_os_stall(10000000);
+}
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 8a112d11d491..f61ebc679e66 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -73,7 +73,7 @@ acpi_rs_stream_option_length(u32 resource_length, u32 minimum_total_length);
 static u8 acpi_rs_count_set_bits(u16 bit_field)
 {
-        acpi_native_uint bits_set;
+        u8 bits_set;
        ACPI_FUNCTION_ENTRY();
@@ -84,7 +84,7 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
                bit_field &= (u16) (bit_field - 1);
        }
-        return ((u8) bits_set);
+        return bits_set;
 }
 /*******************************************************************************
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index faddaee1bc07..7804a8c40e7a 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -181,9 +181,9 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
        }
        /*
-         * Loop through the ACPI_INTERNAL_OBJECTS - Each object
+         * Loop through the ACPI_INTERNAL_OBJECTS - Each object should be a
-         * should be a package that in turn contains an
+         * package that in turn contains an acpi_integer Address, a u8 Pin,
-         * acpi_integer Address, a u8 Pin, a Name and a u8 source_index.
+         * a Name, and a u8 source_index.
         */
        top_object_list = package_object->package.elements;
        number_of_elements = package_object->package.count;
@@ -240,9 +240,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                /* 1) First subobject: Dereference the PRT.Address */
                obj_desc = sub_object_list[0];
-                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+                if (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER) {
-                        user_prt->address = obj_desc->integer.value;
-                } else {
                        ACPI_ERROR((AE_INFO,
                                    "(PRT[%X].Address) Need Integer, found %s",
                                    index,
@@ -250,12 +248,12 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
+                user_prt->address = obj_desc->integer.value;
                /* 2) Second subobject: Dereference the PRT.Pin */
                obj_desc = sub_object_list[1];
-                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+                if (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER) {
-                        user_prt->pin = (u32) obj_desc->integer.value;
-                } else {
                        ACPI_ERROR((AE_INFO,
                                    "(PRT[%X].Pin) Need Integer, found %s",
                                    index,
@@ -284,6 +282,25 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                        }
                }
+                user_prt->pin = (u32) obj_desc->integer.value;
+                /*
+                 * If the BIOS has erroneously reversed the _PRT source_name (index 2)
+                 * and the source_index (index 3), fix it. _PRT is important enough to
+                 * workaround this BIOS error. This also provides compatibility with
+                 * other ACPI implementations.
+                 */
+                obj_desc = sub_object_list[3];
+                if (!obj_desc
+                    || (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER)) {
+                        sub_object_list[3] = sub_object_list[2];
+                        sub_object_list[2] = obj_desc;
+                        ACPI_WARNING((AE_INFO,
+                                      "(PRT[%X].Source) SourceName and SourceIndex are reversed, fixed",
+                                      index));
+                }
                /*
                 * 3) Third subobject: Dereference the PRT.source_name
                 * The name may be unresolved (slack mode), so allow a null object
@@ -364,9 +381,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                /* 4) Fourth subobject: Dereference the PRT.source_index */
                obj_desc = sub_object_list[source_index_index];
-                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+                if (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER) {
-                        user_prt->source_index = (u32) obj_desc->integer.value;
-                } else {
                        ACPI_ERROR((AE_INFO,
                                    "(PRT[%X].SourceIndex) Need Integer, found %s",
                                    index,
@@ -374,6 +389,8 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
+                user_prt->source_index = (u32) obj_desc->integer.value;
                /* Point to the next union acpi_operand_object in the top level package */
                top_object_list++;
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index de1ac3881b22..96a6c0353255 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -82,7 +82,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
        ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
-        if (((acpi_native_uint) resource) & 0x3) {
+        if (((acpi_size) resource) & 0x3) {
                /* Each internal resource struct is expected to be 32-bit aligned */
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index befe2302f41b..f7b3bcd59ba7 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -62,7 +62,7 @@ ACPI_MODULE_NAME("rsutils")
 ******************************************************************************/
 u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 {
-        acpi_native_uint i;
+        u8 i;
        u8 bit_count;
        ACPI_FUNCTION_ENTRY();
@@ -71,7 +71,7 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
        for (i = 0, bit_count = 0; mask; i++) {
                if (mask & 0x0001) {
-                        list[bit_count] = (u8) i;
+                        list[bit_count] = i;
                        bit_count++;
                }
@@ -96,8 +96,8 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 {
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint mask;
+        u16 mask;
        ACPI_FUNCTION_ENTRY();
@@ -107,7 +107,7 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
                mask |= (0x1 << list[i]);
        }
-        return ((u16) mask);
+        return mask;
 }
 /*******************************************************************************
@@ -130,7 +130,7 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 void
 acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
 {
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_ENTRY();
@@ -679,7 +679,6 @@ acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
        info->prefix_node = node;
        info->pathname = METHOD_NAME__SRS;
        info->parameters = args;
-        info->parameter_type = ACPI_PARAM_ARGS;
        info->flags = ACPI_IGNORE_RETURN_VALUE;
        /*
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 6d85289f1c12..f3132aa47a69 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -6,6 +6,8 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/acpi.h>
+#include <linux/signal.h>
+#include <linux/kthread.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acinterp.h>      /* for acpi_ex_eisa_id_to_string() */
@@ -92,17 +94,37 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
-static int acpi_eject_operation(acpi_handle handle, int lockable)
+static int acpi_bus_hot_remove_device(void *context)
 {
+        struct acpi_device *device;
+        acpi_handle handle = context;
        struct acpi_object_list arg_list;
        union acpi_object arg;
        acpi_status status = AE_OK;
-        /*
+        if (acpi_bus_get_device(handle, &device))
-         * TBD: evaluate _PS3?
+                return 0;
-         */
+        if (!device)
+                return 0;
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                "Hot-removing device %s...\n", device->dev.bus_id));
-        if (lockable) {
+        if (acpi_bus_trim(device, 1)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                "Removing device failed\n"));
+                return -1;
+        }
+        /* power off device */
+        status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                                "Power-off device failed\n"));
+        if (device->flags.lockable) {
                arg_list.count = 1;
                arg_list.pointer = &arg;
                arg.type = ACPI_TYPE_INTEGER;
@@ -118,26 +140,22 @@ static int acpi_eject_operation(acpi_handle handle, int lockable)
        /*
         * TBD: _EJD support.
         */
        status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
-        if (ACPI_FAILURE(status)) {
+        if (ACPI_FAILURE(status))
-                return (-ENODEV);
+                return -ENODEV;
-        }
-        return (0);
+        return 0;
 }
 static ssize_t
 acpi_eject_store(struct device *d, struct device_attribute *attr,
                const char *buf, size_t count)
 {
-        int result;
        int ret = count;
-        int islockable;
        acpi_status status;
-        acpi_handle handle;
        acpi_object_type type = 0;
        struct acpi_device *acpi_device = to_acpi_device(d);
+        struct task_struct *task;
        if ((!count) || (buf[0] != '1')) {
                return -EINVAL;
@@ -154,18 +172,12 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
                goto err;
        }
-        islockable = acpi_device->flags.lockable;
+        /* remove the device in another thread to fix the deadlock issue */
-        handle = acpi_device->handle;
+        task = kthread_run(acpi_bus_hot_remove_device,
+                                acpi_device->handle, "acpi_hot_remove_device");
-        result = acpi_bus_trim(acpi_device, 1);
+        if (IS_ERR(task))
+                ret = PTR_ERR(task);
-        if (!result)
+err:
-                result = acpi_eject_operation(handle, islockable);
-        if (result) {
-                ret = -EBUSY;
-        }
-      err:
        return ret;
 }
@@ -691,9 +703,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
        acpi_status status = 0;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        union acpi_object *package = NULL;
-        union acpi_object in_arg[3];
+        int psw_error;
-        struct acpi_object_list arg_list = { 3, in_arg };
-        acpi_status psw_status = AE_OK;
        struct acpi_device_id button_device_ids[] = {
                {"PNP0C0D", 0},
@@ -725,39 +735,11 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         * So it is necessary to call _DSW object first. Only when it is not
         * present will the _PSW object used.
         */
-        /*
+        psw_error = acpi_device_sleep_wake(device, 0, 0, 0);
-         * Three agruments are needed for the _DSW object.
+        if (psw_error)
-         * Argument 0: enable/disable the wake capabilities
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-         * When _DSW object is called to disable the wake capabilities, maybe
+                                "error in _DSW or _PSW evaluation\n"));
-         * the first argument is filled. The value of the other two agruments
-         * is meaningless.
-         */
-        in_arg[0].type = ACPI_TYPE_INTEGER;
-        in_arg[0].integer.value = 0;
-        in_arg[1].type = ACPI_TYPE_INTEGER;
-        in_arg[1].integer.value = 0;
-        in_arg[2].type = ACPI_TYPE_INTEGER;
-        in_arg[2].integer.value = 0;
-        psw_status = acpi_evaluate_object(device->handle, "_DSW",
-                                                &arg_list, NULL);
-        if (ACPI_FAILURE(psw_status) && (psw_status != AE_NOT_FOUND))
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "error in evaluate _DSW\n"));
-        /*
-         * When the _DSW object is not present, OSPM will call _PSW object.
-         */
-        if (psw_status == AE_NOT_FOUND) {
-                /*
-                 * Only one agruments is required for the _PSW object.
-                 * agrument 0: enable/disable the wake capabilities
-                 */
-                arg_list.count = 1;
-                in_arg[0].integer.value = 0;
-                psw_status = acpi_evaluate_object(device->handle, "_PSW",
-                                                &arg_list, NULL);
-                if (ACPI_FAILURE(psw_status) && (psw_status != AE_NOT_FOUND))
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "error in "
-                                                "evaluate _PSW\n"));
-        }
        /* Power button, Lid switch always enable wakeup */
        if (!acpi_match_device_ids(device, button_device_ids))
                device->wakeup.flags.run_wake = 1;
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 495c63a3e0af..0489a7d1d42c 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -24,10 +24,6 @@
 u8 sleep_states[ACPI_S_STATE_COUNT];
-#ifdef CONFIG_PM_SLEEP
-static u32 acpi_target_sleep_state = ACPI_STATE_S0;
-#endif
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
@@ -49,9 +45,96 @@ static int acpi_sleep_prepare(u32 acpi_state)
        return 0;
 }
-#ifdef CONFIG_SUSPEND
+#ifdef CONFIG_PM_SLEEP
-static struct platform_suspend_ops acpi_suspend_ops;
+static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+/*
+ * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
+ * user to request that behavior by using the 'acpi_old_suspend_ordering'
+ * kernel command line option that causes the following variable to be set.
+ */
+static bool old_suspend_ordering;
+void __init acpi_old_suspend_ordering(void)
+{
+        old_suspend_ordering = true;
+}
+/**
+ *      acpi_pm_disable_gpes - Disable the GPEs.
+ */
+static int acpi_pm_disable_gpes(void)
+{
+        acpi_hw_disable_all_gpes();
+        return 0;
+}
+/**
+ *      __acpi_pm_prepare - Prepare the platform to enter the target state.
+ *
+ *      If necessary, set the firmware waking vector and do arch-specific
+ *      nastiness to get the wakeup code to the waking vector.
+ */
+static int __acpi_pm_prepare(void)
+{
+        int error = acpi_sleep_prepare(acpi_target_sleep_state);
+        if (error)
+                acpi_target_sleep_state = ACPI_STATE_S0;
+        return error;
+}
+/**
+ *      acpi_pm_prepare - Prepare the platform to enter the target sleep
+ *              state and disable the GPEs.
+ */
+static int acpi_pm_prepare(void)
+{
+        int error = __acpi_pm_prepare();
+        if (!error)
+                acpi_hw_disable_all_gpes();
+        return error;
+}
+/**
+ *      acpi_pm_finish - Instruct the platform to leave a sleep state.
+ *
+ *      This is called after we wake back up (or if entering the sleep state
+ *      failed).
+ */
+static void acpi_pm_finish(void)
+{
+        u32 acpi_state = acpi_target_sleep_state;
+        if (acpi_state == ACPI_STATE_S0)
+                return;
+        printk(KERN_INFO PREFIX "Waking up from system sleep state S%d\n",
+                acpi_state);
+        acpi_disable_wakeup_device(acpi_state);
+        acpi_leave_sleep_state(acpi_state);
+        /* reset firmware waking vector */
+        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+        acpi_target_sleep_state = ACPI_STATE_S0;
+}
+/**
+ *      acpi_pm_end - Finish up suspend sequence.
+ */
+static void acpi_pm_end(void)
+{
+        /*
+         * This is necessary in case acpi_pm_finish() is not called during a
+         * failing transition to a sleep state.
+         */
+        acpi_target_sleep_state = ACPI_STATE_S0;
+}
+#endif /* CONFIG_PM_SLEEP */
+#ifdef CONFIG_SUSPEND
 extern void do_suspend_lowlevel(void);
 static u32 acpi_suspend_states[] = {
@@ -61,13 +144,10 @@ static u32 acpi_suspend_states[] = {
        [PM_SUSPEND_MAX] = ACPI_STATE_S5
 };
-static int init_8259A_after_S1;
 /**
 *      acpi_suspend_begin - Set the target system sleep state to the state
 *              associated with given @pm_state, if supported.
 */
 static int acpi_suspend_begin(suspend_state_t pm_state)
 {
        u32 acpi_state = acpi_suspend_states[pm_state];
@@ -84,25 +164,6 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
 }
 /**
- *      acpi_suspend_prepare - Do preliminary suspend work.
- *
- *      If necessary, set the firmware waking vector and do arch-specific
- *      nastiness to get the wakeup code to the waking vector.
- */
-static int acpi_suspend_prepare(void)
-{
-        int error = acpi_sleep_prepare(acpi_target_sleep_state);
-        if (error) {
-                acpi_target_sleep_state = ACPI_STATE_S0;
-                return error;
-        }
-        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
-}
-/**
 *      acpi_suspend_enter - Actually enter a sleep state.
 *      @pm_state: ignored
 *
@@ -110,7 +171,6 @@ static int acpi_suspend_prepare(void)
 *      assembly, which in turn call acpi_enter_sleep_state().
 *      It's unfortunate, but it works. Please fix if you're feeling frisky.
 */
 static int acpi_suspend_enter(suspend_state_t pm_state)
 {
        acpi_status status = AE_OK;
@@ -167,46 +227,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
        return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
-/**
- *      acpi_suspend_finish - Instruct the platform to leave a sleep state.
- *
- *      This is called after we wake back up (or if entering the sleep state
- *      failed). 
- */
-static void acpi_suspend_finish(void)
-{
-        u32 acpi_state = acpi_target_sleep_state;
-        acpi_disable_wakeup_device(acpi_state);
-        acpi_leave_sleep_state(acpi_state);
-        /* reset firmware waking vector */
-        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
-        acpi_target_sleep_state = ACPI_STATE_S0;
-#ifdef CONFIG_X86
-        if (init_8259A_after_S1) {
-                printk("Broken toshiba laptop -> kicking interrupts\n");
-                init_8259A(0);
-        }
-#endif
-}
-/**
- *      acpi_suspend_end - Finish up suspend sequence.
- */
-static void acpi_suspend_end(void)
-{
-        /*
-         * This is necessary in case acpi_suspend_finish() is not called during a
-         * failing transition to a sleep state.
-         */
-        acpi_target_sleep_state = ACPI_STATE_S0;
-}
 static int acpi_suspend_state_valid(suspend_state_t pm_state)
 {
        u32 acpi_state;
@@ -226,30 +246,39 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
 static struct platform_suspend_ops acpi_suspend_ops = {
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin,
-        .prepare = acpi_suspend_prepare,
+        .prepare = acpi_pm_prepare,
        .enter = acpi_suspend_enter,
-        .finish = acpi_suspend_finish,
+        .finish = acpi_pm_finish,
-        .end = acpi_suspend_end,
+        .end = acpi_pm_end,
 };
-/*
+/**
- * Toshiba fails to preserve interrupts over S1, reinitialization
+ *      acpi_suspend_begin_old - Set the target system sleep state to the
- * of 8259 is needed after S1 resume.
+ *              state associated with given @pm_state, if supported, and
+ *              execute the _PTS control method.  This function is used if the
+ *              pre-ACPI 2.0 suspend ordering has been requested.
 */
-static int __init init_ints_after_s1(const struct dmi_system_id *d)
+static int acpi_suspend_begin_old(suspend_state_t pm_state)
 {
-        printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident);
+        int error = acpi_suspend_begin(pm_state);
-        init_8259A_after_S1 = 1;
-        return 0;
+        if (!error)
+                error = __acpi_pm_prepare();
+        return error;
 }
-static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
+/*
-        {
+ * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
-         .callback = init_ints_after_s1,
+ * been requested.
-         .ident = "Toshiba Satellite 4030cdt",
+ */
-         .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),},
+static struct platform_suspend_ops acpi_suspend_ops_old = {
-         },
+        .valid = acpi_suspend_state_valid,
-        {},
+        .begin = acpi_suspend_begin_old,
+        .prepare = acpi_pm_disable_gpes,
+        .enter = acpi_suspend_enter,
+        .finish = acpi_pm_finish,
+        .end = acpi_pm_end,
+        .recover = acpi_pm_finish,
 };
 #endif /* CONFIG_SUSPEND */
@@ -257,22 +286,9 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 static int acpi_hibernation_begin(void)
 {
        acpi_target_sleep_state = ACPI_STATE_S4;
        return 0;
 }
-static int acpi_hibernation_prepare(void)
-{
-        int error = acpi_sleep_prepare(ACPI_STATE_S4);
-        if (error) {
-                acpi_target_sleep_state = ACPI_STATE_S0;
-                return error;
-        }
-        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
-}
 static int acpi_hibernation_enter(void)
 {
        acpi_status status = AE_OK;
@@ -302,52 +318,55 @@ static void acpi_hibernation_leave(void)
        acpi_leave_sleep_state_prep(ACPI_STATE_S4);
 }
-static void acpi_hibernation_finish(void)
+static void acpi_pm_enable_gpes(void)
 {
-        acpi_disable_wakeup_device(ACPI_STATE_S4);
+        acpi_hw_enable_all_runtime_gpes();
-        acpi_leave_sleep_state(ACPI_STATE_S4);
-        /* reset firmware waking vector */
-        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
-        acpi_target_sleep_state = ACPI_STATE_S0;
 }
-static void acpi_hibernation_end(void)
+static struct platform_hibernation_ops acpi_hibernation_ops = {
-{
+        .begin = acpi_hibernation_begin,
-        /*
+        .end = acpi_pm_end,
-         * This is necessary in case acpi_hibernation_finish() is not called
+        .pre_snapshot = acpi_pm_prepare,
-         * during a failing transition to the sleep state.
+        .finish = acpi_pm_finish,
-         */
+        .prepare = acpi_pm_prepare,
-        acpi_target_sleep_state = ACPI_STATE_S0;
+        .enter = acpi_hibernation_enter,
-}
+        .leave = acpi_hibernation_leave,
+        .pre_restore = acpi_pm_disable_gpes,
+        .restore_cleanup = acpi_pm_enable_gpes,
+};
-static int acpi_hibernation_pre_restore(void)
+/**
+ *      acpi_hibernation_begin_old - Set the target system sleep state to
+ *              ACPI_STATE_S4 and execute the _PTS control method.  This
+ *              function is used if the pre-ACPI 2.0 suspend ordering has been
+ *              requested.
+ */
+static int acpi_hibernation_begin_old(void)
 {
-        acpi_status status;
+        int error = acpi_sleep_prepare(ACPI_STATE_S4);
-        status = acpi_hw_disable_all_gpes();
-        return ACPI_SUCCESS(status) ? 0 : -EFAULT;
-}
-static void acpi_hibernation_restore_cleanup(void)
+        if (!error)
-{
+                acpi_target_sleep_state = ACPI_STATE_S4;
-        acpi_hw_enable_all_runtime_gpes();
+        return error;
 }
-static struct platform_hibernation_ops acpi_hibernation_ops = {
+/*
-        .begin = acpi_hibernation_begin,
+ * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
-        .end = acpi_hibernation_end,
+ * been requested.
-        .pre_snapshot = acpi_hibernation_prepare,
+ */
-        .finish = acpi_hibernation_finish,
+static struct platform_hibernation_ops acpi_hibernation_ops_old = {
-        .prepare = acpi_hibernation_prepare,
+        .begin = acpi_hibernation_begin_old,
+        .end = acpi_pm_end,
+        .pre_snapshot = acpi_pm_disable_gpes,
+        .finish = acpi_pm_finish,
+        .prepare = acpi_pm_disable_gpes,
        .enter = acpi_hibernation_enter,
        .leave = acpi_hibernation_leave,
-        .pre_restore = acpi_hibernation_pre_restore,
+        .pre_restore = acpi_pm_disable_gpes,
-        .restore_cleanup = acpi_hibernation_restore_cleanup,
+        .restore_cleanup = acpi_pm_enable_gpes,
+        .recover = acpi_pm_finish,
 };
-#endif                          /* CONFIG_HIBERNATION */
+#endif /* CONFIG_HIBERNATION */
 int acpi_suspend(u32 acpi_state)
 {
@@ -368,8 +387,8 @@ int acpi_suspend(u32 acpi_state)
 /**
 *      acpi_pm_device_sleep_state - return preferred power state of ACPI device
 *              in the system sleep state given by %acpi_target_sleep_state
- *      @dev: device to examine
+ *      @dev: device to examine; its driver model wakeup flags control
- *      @wake: if set, the device should be able to wake up the system
+ *              whether it should be able to wake up the system
 *      @d_min_p: used to store the upper limit of allowed states range
 *      Return value: preferred power state of the device on success, -ENODEV on
 *              failure (ie. if there's no 'struct acpi_device' for @dev)
@@ -387,7 +406,7 @@ int acpi_suspend(u32 acpi_state)
 *      via @wake.
 */
-int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
+int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
 {
        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
        struct acpi_device *adev;
@@ -426,7 +445,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
         * can wake the system.  _S0W may be valid, too.
         */
        if (acpi_target_sleep_state == ACPI_STATE_S0 ||
-            (wake && adev->wakeup.state.enabled &&
+            (device_may_wakeup(dev) && adev->wakeup.state.enabled &&
             adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
                acpi_status status;
@@ -448,6 +467,31 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
                *d_min_p = d_min;
        return d_max;
 }
+/**
+ *      acpi_pm_device_sleep_wake - enable or disable the system wake-up
+ *                                  capability of given device
+ *      @dev: device to handle
+ *      @enable: 'true' - enable, 'false' - disable the wake-up capability
+ */
+int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
+{
+        acpi_handle handle;
+        struct acpi_device *adev;
+        if (!device_may_wakeup(dev))
+                return -EINVAL;
+        handle = DEVICE_ACPI_HANDLE(dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                printk(KERN_DEBUG "ACPI handle has no context!\n");
+                return -ENODEV;
+        }
+        return enable ?
+                acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
+                acpi_disable_wakeup_device_power(adev);
+}
 #endif
 static void acpi_power_off_prepare(void)
@@ -472,8 +516,6 @@ int __init acpi_sleep_init(void)
        u8 type_a, type_b;
 #ifdef CONFIG_SUSPEND
        int i = 0;
-        dmi_check_system(acpisleep_dmi_table);
 #endif
        if (acpi_disabled)
@@ -491,13 +533,15 @@ int __init acpi_sleep_init(void)
                }
        }
-        suspend_set_ops(&acpi_suspend_ops);
+        suspend_set_ops(old_suspend_ordering ?
+                &acpi_suspend_ops_old : &acpi_suspend_ops);
 #endif
 #ifdef CONFIG_HIBERNATION
        status = acpi_get_sleep_type_data(ACPI_STATE_S4, &type_a, &type_b);
        if (ACPI_SUCCESS(status)) {
-                hibernation_set_ops(&acpi_hibernation_ops);
+                hibernation_set_ops(old_suspend_ordering ?
+                        &acpi_hibernation_ops_old : &acpi_hibernation_ops);
                sleep_states[ACPI_STATE_S4] = 1;
                printk(" S4");
        }
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index ed8e41becf0c..38655eb132dc 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -42,7 +42,7 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state)
                        continue;
                spin_unlock(&acpi_device_lock);
-                acpi_enable_wakeup_device_power(dev);
+                acpi_enable_wakeup_device_power(dev, sleep_state);
                spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
@@ -66,13 +66,15 @@ void acpi_enable_wakeup_device(u8 sleep_state)
        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                struct acpi_device *dev =
                        container_of(node, struct acpi_device, wakeup_list);
                if (!dev->wakeup.flags.valid)
                        continue;
                /* If users want to disable run-wake GPE,
                 * we only disable it for wake and leave it for runtime
                 */
-                if (!dev->wakeup.state.enabled ||
+                if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
-                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                    || sleep_state > (u32) dev->wakeup.sleep_state) {
                        if (dev->wakeup.flags.run_wake) {
                                spin_unlock(&acpi_device_lock);
                                /* set_gpe_type will disable GPE, leave it like that */
@@ -110,8 +112,9 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                if (!dev->wakeup.flags.valid)
                        continue;
-                if (!dev->wakeup.state.enabled ||
-                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
+                    || sleep_state > (u32) dev->wakeup.sleep_state) {
                        if (dev->wakeup.flags.run_wake) {
                                spin_unlock(&acpi_device_lock);
                                acpi_set_gpe_type(dev->wakeup.gpe_device,
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 5bd2dec9a7ac..d8e3f153b295 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -167,7 +167,13 @@ static int acpi_system_sysfs_init(void)
 #define COUNT_ERROR 2   /* other */
 #define NUM_COUNTERS_EXTRA 3
-static u32 *all_counters;
+#define ACPI_EVENT_VALID        0x01
+struct event_counter {
+        u32 count;
+        u32 flags;
+};
+static struct event_counter *all_counters;
 static u32 num_gpes;
 static u32 num_counters;
 static struct attribute **all_attrs;
@@ -202,9 +208,44 @@ static int count_num_gpes(void)
        return count;
 }
+static int get_gpe_device(int index, acpi_handle *handle)
+{
+        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
+        struct acpi_gpe_block_info *gpe_block;
+        acpi_cpu_flags flags;
+        struct acpi_namespace_node *node;
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
+        while (gpe_xrupt_info) {
+                gpe_block = gpe_xrupt_info->gpe_block_list_head;
+                node = gpe_block->node;
+                while (gpe_block) {
+                        index -= gpe_block->register_count *
+                            ACPI_GPE_REGISTER_WIDTH;
+                        if (index < 0) {
+                                acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+                                /* return NULL if it's FADT GPE */
+                                if (node->type != ACPI_TYPE_DEVICE)
+                                        *handle = NULL;
+                                else
+                                        *handle = node;
+                                return 0;
+                        }
+                        node = gpe_block->node;
+                        gpe_block = gpe_block->next;
+                }
+                gpe_xrupt_info = gpe_xrupt_info->next;
+        }
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return -ENODEV;
+}
 static void delete_gpe_attr_array(void)
 {
-        u32 *tmp = all_counters;
+        struct event_counter *tmp = all_counters;
        all_counters = NULL;
        kfree(tmp);
@@ -230,9 +271,10 @@ void acpi_os_gpe_count(u32 gpe_number)
                return;
        if (gpe_number < num_gpes)
-                all_counters[gpe_number]++;
+                all_counters[gpe_number].count++;
        else
-                all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR]++;
+                all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR].
+                                        count++;
        return;
 }
@@ -243,44 +285,144 @@ void acpi_os_fixed_event_count(u32 event_number)
                return;
        if (event_number < ACPI_NUM_FIXED_EVENTS)
-                all_counters[num_gpes + event_number]++;
+                all_counters[num_gpes + event_number].count++;
        else
-                all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR]++;
+                all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR].
+                                count++;
        return;
 }
+static int get_status(u32 index, acpi_event_status *status, acpi_handle *handle)
+{
+        int result = 0;
+        if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
+                goto end;
+        if (index < num_gpes) {
+                result = get_gpe_device(index, handle);
+                if (result) {
+                        ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
+                                "Invalid GPE 0x%x\n", index));
+                        goto end;
+                }
+                result = acpi_get_gpe_status(*handle, index,
+                                                ACPI_NOT_ISR, status);
+        } else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))
+                result = acpi_get_event_status(index - num_gpes, status);
+        /*
+         * sleep/power button GPE/Fixed Event is enabled after acpi_system_init,
+         * check the status at runtime and mark it as valid once it's enabled
+         */
+        if (!result && (*status & ACPI_EVENT_FLAG_ENABLED))
+                all_counters[index].flags |= ACPI_EVENT_VALID;
+end:
+        return result;
+}
 static ssize_t counter_show(struct kobject *kobj,
        struct kobj_attribute *attr, char *buf)
 {
-        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI] =
+        int index = attr - counter_attrs;
+        int size;
+        acpi_handle handle;
+        acpi_event_status status;
+        int result = 0;
+        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI].count =
                acpi_irq_handled;
-        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE] =
+        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE].count =
                acpi_gpe_count;
-        return sprintf(buf, "%d\n", all_counters[attr - counter_attrs]);
+        size = sprintf(buf, "%8d", all_counters[index].count);
+        /* "gpe_all" or "sci" */
+        if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
+                goto end;
+        result = get_status(index, &status, &handle);
+        if (result)
+                goto end;
+        if (!(all_counters[index].flags & ACPI_EVENT_VALID))
+                size += sprintf(buf + size, "  invalid");
+        else if (status & ACPI_EVENT_FLAG_ENABLED)
+                size += sprintf(buf + size, "   enable");
+        else
+                size += sprintf(buf + size, "  disable");
+end:
+        size += sprintf(buf + size, "\n");
+        return result ? result : size;
 }
 /*
 * counter_set() sets the specified counter.
 * setting the total "sci" file to any value clears all counters.
+ * enable/disable/clear a gpe/fixed event in user space.
 */
 static ssize_t counter_set(struct kobject *kobj,
        struct kobj_attribute *attr, const char *buf, size_t size)
 {
        int index = attr - counter_attrs;
+        acpi_event_status status;
+        acpi_handle handle;
+        int result = 0;
        if (index == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI) {
                int i;
                for (i = 0; i < num_counters; ++i)
-                        all_counters[i] = 0;
+                        all_counters[i].count = 0;
                acpi_gpe_count = 0;
                acpi_irq_handled = 0;
+                goto end;
+        }
+        /* show the event status for both GPEs and Fixed Events */
+        result = get_status(index, &status, &handle);
+        if (result)
+                goto end;
+        if (!(all_counters[index].flags & ACPI_EVENT_VALID)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                        "Can not change Invalid GPE/Fixed Event status\n"));
+                return -EINVAL;
+        }
+        if (index < num_gpes) {
+                if (!strcmp(buf, "disable\n") &&
+                                (status & ACPI_EVENT_FLAG_ENABLED))
+                        result = acpi_disable_gpe(handle, index, ACPI_NOT_ISR);
+                else if (!strcmp(buf, "enable\n") &&
+                                !(status & ACPI_EVENT_FLAG_ENABLED))
+                        result = acpi_enable_gpe(handle, index, ACPI_NOT_ISR);
+                else if (!strcmp(buf, "clear\n") &&
+                                (status & ACPI_EVENT_FLAG_SET))
+                        result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
+                else
+                        all_counters[index].count = strtoul(buf, NULL, 0);
+        } else if (index < num_gpes + ACPI_NUM_FIXED_EVENTS) {
+                int event = index - num_gpes;
+                if (!strcmp(buf, "disable\n") &&
+                                (status & ACPI_EVENT_FLAG_ENABLED))
+                        result = acpi_disable_event(event, ACPI_NOT_ISR);
+                else if (!strcmp(buf, "enable\n") &&
+                                !(status & ACPI_EVENT_FLAG_ENABLED))
+                        result = acpi_enable_event(event, ACPI_NOT_ISR);
+                else if (!strcmp(buf, "clear\n") &&
+                                (status & ACPI_EVENT_FLAG_SET))
+                        result = acpi_clear_event(event);
+                else
+                        all_counters[index].count = strtoul(buf, NULL, 0);
        } else
-                all_counters[index] = strtoul(buf, NULL, 0);
+                all_counters[index].count = strtoul(buf, NULL, 0);
-        return size;
+        if (ACPI_FAILURE(result))
+                result = -EINVAL;
+end:
+        return result ? result : size;
 }
 void acpi_irq_stats_init(void)
@@ -298,7 +440,8 @@ void acpi_irq_stats_init(void)
        if (all_attrs == NULL)
                return;
-        all_counters = kzalloc(sizeof(u32) * (num_counters), GFP_KERNEL);
+        all_counters = kzalloc(sizeof(struct event_counter) * (num_counters),
+                                GFP_KERNEL);
        if (all_counters == NULL)
                goto fail;
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 949d4114eb9f..ccb5b64bbef3 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -124,7 +124,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
 static void inline
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 bit_width, u64 address)
+                             u8 byte_width, u64 address)
 {
        /*
@@ -136,7 +136,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
        /* All other fields are byte-wide */
        generic_address->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
-        generic_address->bit_width = bit_width;
+        generic_address->bit_width = byte_width << 3;
        generic_address->bit_offset = 0;
        generic_address->access_width = 0;
 }
@@ -155,7 +155,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 *
 ******************************************************************************/
-void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
+void acpi_tb_parse_fadt(u32 table_index, u8 flags)
 {
        u32 length;
        struct acpi_table_header *table;
@@ -280,7 +280,7 @@ static void acpi_tb_convert_fadt(void)
 {
        u8 pm1_register_length;
        struct acpi_generic_address *target;
-        acpi_native_uint i;
+        u32 i;
        /* Update the local FADT table header length */
@@ -343,9 +343,11 @@ static void acpi_tb_convert_fadt(void)
         *
         * The PM event blocks are split into two register blocks, first is the
         * PM Status Register block, followed immediately by the PM Enable Register
-         * block. Each is of length (pm1_event_length/2)
+         * block. Each is of length (xpm1x_event_block.bit_width/2)
         */
-        pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
+        WARN_ON(ACPI_MOD_16(acpi_gbl_FADT.xpm1a_event_block.bit_width));
+        pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
+                                               .xpm1a_event_block.bit_width);
        /* The PM1A register block is required */
@@ -360,14 +362,17 @@ static void acpi_tb_convert_fadt(void)
        /* The PM1B register block is optional, ignore if not present */
        if (acpi_gbl_FADT.xpm1b_event_block.address) {
+                WARN_ON(ACPI_MOD_16(acpi_gbl_FADT.xpm1b_event_block.bit_width));
+                pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
+                                                       .xpm1b_event_block
+                                                       .bit_width);
                acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
                                             pm1_register_length,
                                             (acpi_gbl_FADT.xpm1b_event_block.
                                              address + pm1_register_length));
                /* Don't forget to copy space_id of the GAS */
                acpi_gbl_xpm1b_enable.space_id =
-                    acpi_gbl_FADT.xpm1a_event_block.space_id;
+                    acpi_gbl_FADT.xpm1b_event_block.space_id;
        }
 }
@@ -396,7 +401,7 @@ static void acpi_tb_validate_fadt(void)
        u32 *address32;
        struct acpi_generic_address *address64;
        u8 length;
-        acpi_native_uint i;
+        u32 i;
        /* Examine all of the 64-bit extended address fields (X fields) */
diff --git a/drivers/acpi/tables/tbfind.c b/drivers/acpi/tables/tbfind.c
index 9ca3afc98c80..531584defbb8 100644
--- a/drivers/acpi/tables/tbfind.c
+++ b/drivers/acpi/tables/tbfind.c
@@ -65,10 +65,9 @@ ACPI_MODULE_NAME("tbfind")
 ******************************************************************************/
 acpi_status
 acpi_tb_find_table(char *signature,
-                   char *oem_id,
+                   char *oem_id, char *oem_table_id, u32 *table_index)
-                   char *oem_table_id, acpi_native_uint * table_index)
 {
-        acpi_native_uint i;
+        u32 i;
        acpi_status status;
        struct acpi_table_header header;
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 5336ce88f89f..b22185f55a16 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -107,11 +107,10 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc)
 ******************************************************************************/
 acpi_status
-acpi_tb_add_table(struct acpi_table_desc *table_desc,
+acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
-                  acpi_native_uint * table_index)
 {
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint length;
+        u32 length;
        acpi_status status = AE_OK;
        ACPI_FUNCTION_TRACE(tb_add_table);
@@ -207,8 +206,8 @@ acpi_status acpi_tb_resize_root_table_list(void)
        /* Increase the Table Array size */
-        tables = ACPI_ALLOCATE_ZEROED((acpi_gbl_root_table_list.size +
+        tables = ACPI_ALLOCATE_ZEROED(((acpi_size) acpi_gbl_root_table_list.
-                                       ACPI_ROOT_TABLE_SIZE_INCREMENT)
+                                       size + ACPI_ROOT_TABLE_SIZE_INCREMENT)
                                      * sizeof(struct acpi_table_desc));
        if (!tables) {
                ACPI_ERROR((AE_INFO,
@@ -220,7 +219,7 @@ acpi_status acpi_tb_resize_root_table_list(void)
        if (acpi_gbl_root_table_list.tables) {
                ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
-                            acpi_gbl_root_table_list.size *
+                            (acpi_size) acpi_gbl_root_table_list.size *
                            sizeof(struct acpi_table_desc));
                if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
@@ -253,7 +252,7 @@ acpi_status acpi_tb_resize_root_table_list(void)
 acpi_status
 acpi_tb_store_table(acpi_physical_address address,
                    struct acpi_table_header *table,
-                    u32 length, u8 flags, acpi_native_uint * table_index)
+                    u32 length, u8 flags, u32 *table_index)
 {
        acpi_status status = AE_OK;
@@ -334,7 +333,7 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
 void acpi_tb_terminate(void)
 {
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(tb_terminate);
@@ -374,7 +373,7 @@ void acpi_tb_terminate(void)
 *
 ******************************************************************************/
-void acpi_tb_delete_namespace_by_owner(acpi_native_uint table_index)
+void acpi_tb_delete_namespace_by_owner(u32 table_index)
 {
        acpi_owner_id owner_id;
@@ -403,7 +402,7 @@ void acpi_tb_delete_namespace_by_owner(acpi_native_uint table_index)
 *
 ******************************************************************************/
-acpi_status acpi_tb_allocate_owner_id(acpi_native_uint table_index)
+acpi_status acpi_tb_allocate_owner_id(u32 table_index)
 {
        acpi_status status = AE_BAD_PARAMETER;
@@ -431,7 +430,7 @@ acpi_status acpi_tb_allocate_owner_id(acpi_native_uint table_index)
 *
 ******************************************************************************/
-acpi_status acpi_tb_release_owner_id(acpi_native_uint table_index)
+acpi_status acpi_tb_release_owner_id(u32 table_index)
 {
        acpi_status status = AE_BAD_PARAMETER;
@@ -462,8 +461,7 @@ acpi_status acpi_tb_release_owner_id(acpi_native_uint table_index)
 *
 ******************************************************************************/
-acpi_status
+acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id)
-acpi_tb_get_owner_id(acpi_native_uint table_index, acpi_owner_id * owner_id)
 {
        acpi_status status = AE_BAD_PARAMETER;
@@ -490,7 +488,7 @@ acpi_tb_get_owner_id(acpi_native_uint table_index, acpi_owner_id * owner_id)
 *
 ******************************************************************************/
-u8 acpi_tb_is_table_loaded(acpi_native_uint table_index)
+u8 acpi_tb_is_table_loaded(u32 table_index)
 {
        u8 is_loaded = FALSE;
@@ -518,7 +516,7 @@ u8 acpi_tb_is_table_loaded(acpi_native_uint table_index)
 *
 ******************************************************************************/
-void acpi_tb_set_table_loaded_flag(acpi_native_uint table_index, u8 is_loaded)
+void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded)
 {
        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index bc019b9b6a68..0cc92ef5236f 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -49,8 +49,8 @@ ACPI_MODULE_NAME("tbutils")
 /* Local prototypes */
 static acpi_physical_address
-acpi_tb_get_root_table_entry(u8 * table_entry,
+acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
-                             acpi_native_uint table_entry_size);
 /*******************************************************************************
 *
 * FUNCTION:    acpi_tb_check_xsdt
@@ -238,7 +238,7 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 *
 ******************************************************************************/
-u8 acpi_tb_checksum(u8 * buffer, acpi_native_uint length)
+u8 acpi_tb_checksum(u8 *buffer, u32 length)
 {
        u8 sum = 0;
        u8 *end = buffer + length;
@@ -268,7 +268,7 @@ u8 acpi_tb_checksum(u8 * buffer, acpi_native_uint length)
 void
 acpi_tb_install_table(acpi_physical_address address,
-                      u8 flags, char *signature, acpi_native_uint table_index)
+                      u8 flags, char *signature, u32 table_index)
 {
        struct acpi_table_header *table;
@@ -336,8 +336,7 @@ acpi_tb_install_table(acpi_physical_address address,
 ******************************************************************************/
 static acpi_physical_address
-acpi_tb_get_root_table_entry(u8 * table_entry,
+acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
-                             acpi_native_uint table_entry_size)
 {
        u64 address64;
@@ -395,8 +394,8 @@ acpi_status __init
 acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 {
        struct acpi_table_rsdp *rsdp;
-        acpi_native_uint table_entry_size;
+        u32 table_entry_size;
-        acpi_native_uint i;
+        u32 i;
        u32 table_count;
        struct acpi_table_header *table;
        acpi_physical_address address;
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 0e319604d3e7..fd7770aa1061 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -125,7 +125,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
                /* Root Table Array has been statically allocated by the host */
                ACPI_MEMSET(initial_table_array, 0,
-                            initial_table_count *
+                            (acpi_size) initial_table_count *
                            sizeof(struct acpi_table_desc));
                acpi_gbl_root_table_list.tables = initial_table_array;
@@ -183,9 +183,9 @@ acpi_status acpi_reallocate_root_table(void)
                return_ACPI_STATUS(AE_SUPPORT);
        }
-        new_size =
+        new_size = ((acpi_size) acpi_gbl_root_table_list.count +
-            (acpi_gbl_root_table_list.count +
+                    ACPI_ROOT_TABLE_SIZE_INCREMENT) *
-             ACPI_ROOT_TABLE_SIZE_INCREMENT) * sizeof(struct acpi_table_desc);
+            sizeof(struct acpi_table_desc);
        /* Create new array and copy the old array */
@@ -222,7 +222,7 @@ acpi_status acpi_reallocate_root_table(void)
 acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
 {
        acpi_status status;
-        acpi_native_uint table_index;
+        u32 table_index;
        struct acpi_table_desc table_desc;
        if (!table_ptr)
@@ -264,11 +264,10 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
 *****************************************************************************/
 acpi_status
 acpi_get_table_header(char *signature,
-                      acpi_native_uint instance,
+                      u32 instance, struct acpi_table_header *out_table_header)
-                      struct acpi_table_header * out_table_header)
 {
-        acpi_native_uint i;
+       u32 i;
-        acpi_native_uint j;
+       u32 j;
        struct acpi_table_header *header;
        /* Parameter validation */
@@ -378,10 +377,10 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
 *****************************************************************************/
 acpi_status
 acpi_get_table(char *signature,
-               acpi_native_uint instance, struct acpi_table_header **out_table)
+               u32 instance, struct acpi_table_header **out_table)
 {
-        acpi_native_uint i;
+       u32 i;
-        acpi_native_uint j;
+       u32 j;
        acpi_status status;
        /* Parameter validation */
@@ -435,8 +434,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
 *
 ******************************************************************************/
 acpi_status
-acpi_get_table_by_index(acpi_native_uint table_index,
+acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
-                        struct acpi_table_header ** table)
 {
        acpi_status status;
@@ -493,7 +491,7 @@ static acpi_status acpi_tb_load_namespace(void)
 {
        acpi_status status;
        struct acpi_table_header *table;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(tb_load_namespace);
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index b8c0dfa084f6..2d157e0f98d2 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -118,7 +118,7 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 *
 ******************************************************************************/
-acpi_status acpi_find_root_pointer(acpi_native_uint * table_address)
+acpi_status acpi_find_root_pointer(acpi_size *table_address)
 {
        u8 *table_ptr;
        u8 *mem_rover;
@@ -153,7 +153,7 @@ acpi_status acpi_find_root_pointer(acpi_native_uint * table_address)
                 * 1b) Search EBDA paragraphs (EBDA is required to be a
                 *     minimum of 1_k length)
                 */
-                table_ptr = acpi_os_map_memory((acpi_native_uint)
+                table_ptr = acpi_os_map_memory((acpi_physical_address)
                                               physical_address,
                                               ACPI_EBDA_WINDOW_SIZE);
                if (!table_ptr) {
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index ede084829a70..3dfb8a442b26 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -309,7 +309,8 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 *
 ******************************************************************************/
-void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
+void *acpi_ut_allocate(acpi_size size,
+                       u32 component, const char *module, u32 line)
 {
        void *allocation;
@@ -353,7 +354,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
 ******************************************************************************/
 void *acpi_ut_allocate_zeroed(acpi_size size,
-                              u32 component, char *module, u32 line)
+                              u32 component, const char *module, u32 line)
 {
        void *allocation;
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 655c290aca7b..53499ac90988 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -572,7 +572,7 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
        acpi_status status = AE_OK;
        union acpi_operand_object *package_object;
        union acpi_operand_object **package_elements;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE(ut_copy_epackage_to_ipackage);
@@ -599,7 +599,7 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
                        /* Truncate package and delete it */
-                        package_object->package.count = (u32) i;
+                        package_object->package.count = i;
                        package_elements[i] = NULL;
                        acpi_ut_remove_reference(package_object);
                        return_ACPI_STATUS(status);
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index f938f465efa4..fd66ecb6741e 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -157,7 +157,8 @@ void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print(u32 requested_debug_level,
                    u32 line_number,
                    const char *function_name,
-                    char *module_name, u32 component_id, char *format, ...)
+                    const char *module_name,
+                    u32 component_id, const char *format, ...)
 {
        acpi_thread_id thread_id;
        va_list args;
@@ -228,7 +229,8 @@ void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw(u32 requested_debug_level,
                        u32 line_number,
                        const char *function_name,
-                        char *module_name, u32 component_id, char *format, ...)
+                        const char *module_name,
+                        u32 component_id, const char *format, ...)
 {
        va_list args;
@@ -261,7 +263,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw)
 ******************************************************************************/
 void
 acpi_ut_trace(u32 line_number,
-              const char *function_name, char *module_name, u32 component_id)
+              const char *function_name,
+              const char *module_name, u32 component_id)
 {
        acpi_gbl_nesting_level++;
@@ -293,7 +296,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
 void
 acpi_ut_trace_ptr(u32 line_number,
                  const char *function_name,
-                  char *module_name, u32 component_id, void *pointer)
+                  const char *module_name, u32 component_id, void *pointer)
 {
        acpi_gbl_nesting_level++;
        acpi_ut_track_stack_ptr();
@@ -324,7 +327,7 @@ acpi_ut_trace_ptr(u32 line_number,
 void
 acpi_ut_trace_str(u32 line_number,
                  const char *function_name,
-                  char *module_name, u32 component_id, char *string)
+                  const char *module_name, u32 component_id, char *string)
 {
        acpi_gbl_nesting_level++;
@@ -356,7 +359,7 @@ acpi_ut_trace_str(u32 line_number,
 void
 acpi_ut_trace_u32(u32 line_number,
                  const char *function_name,
-                  char *module_name, u32 component_id, u32 integer)
+                  const char *module_name, u32 component_id, u32 integer)
 {
        acpi_gbl_nesting_level++;
@@ -386,7 +389,8 @@ acpi_ut_trace_u32(u32 line_number,
 void
 acpi_ut_exit(u32 line_number,
-             const char *function_name, char *module_name, u32 component_id)
+             const char *function_name,
+             const char *module_name, u32 component_id)
 {
        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
@@ -417,7 +421,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
 void
 acpi_ut_status_exit(u32 line_number,
                    const char *function_name,
-                    char *module_name, u32 component_id, acpi_status status)
+                    const char *module_name,
+                    u32 component_id, acpi_status status)
 {
        if (ACPI_SUCCESS(status)) {
@@ -458,7 +463,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
 void
 acpi_ut_value_exit(u32 line_number,
                   const char *function_name,
-                   char *module_name, u32 component_id, acpi_integer value)
+                   const char *module_name,
+                   u32 component_id, acpi_integer value)
 {
        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
@@ -490,7 +496,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
 void
 acpi_ut_ptr_exit(u32 line_number,
                 const char *function_name,
-                 char *module_name, u32 component_id, u8 * ptr)
+                 const char *module_name, u32 component_id, u8 *ptr)
 {
        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
@@ -519,8 +525,8 @@ acpi_ut_ptr_exit(u32 line_number,
 void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 {
-        acpi_native_uint i = 0;
+        u32 i = 0;
-        acpi_native_uint j;
+        u32 j;
        u32 temp32;
        u8 buf_char;
@@ -539,7 +545,7 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
                /* Print current offset */
-                acpi_os_printf("%6.4X: ", (u32) i);
+                acpi_os_printf("%6.4X: ", i);
                /* Print 16 hex chars */
@@ -549,7 +555,7 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
                                /* Dump fill spaces */
                                acpi_os_printf("%*s", ((display * 2) + 1), " ");
-                                j += (acpi_native_uint) display;
+                                j += display;
                                continue;
                        }
@@ -557,32 +563,38 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
                        case DB_BYTE_DISPLAY:
                        default:        /* Default is BYTE display */
-                                acpi_os_printf("%02X ", buffer[i + j]);
+                                acpi_os_printf("%02X ",
+                                               buffer[(acpi_size) i + j]);
                                break;
                        case DB_WORD_DISPLAY:
-                                ACPI_MOVE_16_TO_32(&temp32, &buffer[i + j]);
+                                ACPI_MOVE_16_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
                                acpi_os_printf("%04X ", temp32);
                                break;
                        case DB_DWORD_DISPLAY:
-                                ACPI_MOVE_32_TO_32(&temp32, &buffer[i + j]);
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
                                acpi_os_printf("%08X ", temp32);
                                break;
                        case DB_QWORD_DISPLAY:
-                                ACPI_MOVE_32_TO_32(&temp32, &buffer[i + j]);
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j]);
                                acpi_os_printf("%08X", temp32);
-                                ACPI_MOVE_32_TO_32(&temp32, &buffer[i + j + 4]);
+                                ACPI_MOVE_32_TO_32(&temp32,
+                                                   &buffer[(acpi_size) i + j +
+                                                           4]);
                                acpi_os_printf("%08X ", temp32);
                                break;
                        }
-                        j += (acpi_native_uint) display;
+                        j += display;
                }
                /*
@@ -596,7 +608,7 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
                                return;
                        }
-                        buf_char = buffer[i + j];
+                        buf_char = buffer[(acpi_size) i + j];
                        if (ACPI_IS_PRINT(buf_char)) {
                                acpi_os_printf("%c", buf_char);
                        } else {
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 1fbc35139e84..c5c791a575c9 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -442,7 +442,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
        union acpi_generic_state *state_list = NULL;
        union acpi_operand_object *next_object = NULL;
        union acpi_generic_state *state;
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_TRACE_PTR(ut_update_object_reference, object);
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);
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 1f057b71db1a..f34be6773556 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("utmisc")
 ******************************************************************************/
 const char *acpi_ut_validate_exception(acpi_status status)
 {
-        acpi_status sub_status;
+        u32 sub_status;
        const char *exception = NULL;
        ACPI_FUNCTION_ENTRY();
@@ -85,32 +85,28 @@ const char *acpi_ut_validate_exception(acpi_status status)
        case AE_CODE_PROGRAMMER:
                if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception =
+                        exception = acpi_gbl_exception_names_pgm[sub_status];
-                            acpi_gbl_exception_names_pgm[sub_status - 1];
                }
                break;
        case AE_CODE_ACPI_TABLES:
                if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception =
+                        exception = acpi_gbl_exception_names_tbl[sub_status];
-                            acpi_gbl_exception_names_tbl[sub_status - 1];
                }
                break;
        case AE_CODE_AML:
                if (sub_status <= AE_CODE_AML_MAX) {
-                        exception =
+                        exception = acpi_gbl_exception_names_aml[sub_status];
-                            acpi_gbl_exception_names_aml[sub_status - 1];
                }
                break;
        case AE_CODE_CONTROL:
                if (sub_status <= AE_CODE_CTRL_MAX) {
-                        exception =
+                        exception = acpi_gbl_exception_names_ctrl[sub_status];
-                            acpi_gbl_exception_names_ctrl[sub_status - 1];
                }
                break;
@@ -165,9 +161,9 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
 acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
 {
-        acpi_native_uint i;
+        u32 i;
-        acpi_native_uint j;
+        u32 j;
-        acpi_native_uint k;
+        u32 k;
        acpi_status status;
        ACPI_FUNCTION_TRACE(ut_allocate_owner_id);
@@ -273,7 +269,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
 {
        acpi_owner_id owner_id = *owner_id_ptr;
        acpi_status status;
-        acpi_native_uint index;
+        u32 index;
        u32 bit;
        ACPI_FUNCTION_TRACE_U32(ut_release_owner_id, owner_id);
@@ -593,7 +589,7 @@ acpi_ut_display_init_pathname(u8 type,
 *
 ******************************************************************************/
-u8 acpi_ut_valid_acpi_char(char character, acpi_native_uint position)
+u8 acpi_ut_valid_acpi_char(char character, u32 position)
 {
        if (!((character >= 'A' && character <= 'Z') ||
@@ -628,7 +624,7 @@ u8 acpi_ut_valid_acpi_char(char character, acpi_native_uint position)
 u8 acpi_ut_valid_acpi_name(u32 name)
 {
-        acpi_native_uint i;
+        u32 i;
        ACPI_FUNCTION_ENTRY();
@@ -657,7 +653,7 @@ u8 acpi_ut_valid_acpi_name(u32 name)
 acpi_name acpi_ut_repair_name(char *name)
 {
-        acpi_native_uint i;
+       u32 i;
        char new_name[ACPI_NAME_SIZE];
        for (i = 0; i < ACPI_NAME_SIZE; i++) {
@@ -1024,7 +1020,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
 ******************************************************************************/
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...)
 {
        va_list args;
@@ -1037,8 +1033,8 @@ acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
 }
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_exception(char *module_name,
+acpi_ut_exception(const char *module_name,
-                  u32 line_number, acpi_status status, char *format, ...)
+                  u32 line_number, acpi_status status, const char *format, ...)
 {
        va_list args;
@@ -1054,7 +1050,8 @@ acpi_ut_exception(char *module_name,
 EXPORT_SYMBOL(acpi_ut_exception);
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_warning(const char *module_name,
+                u32 line_number, const char *format, ...)
 {
        va_list args;
@@ -1067,7 +1064,7 @@ acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
 }
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...)
 {
        va_list args;
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index f7d602b1a894..7331dde9e1b3 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -218,7 +218,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 * the mutex ordering rule.  This indicates a coding error somewhere in
                 * the ACPI subsystem code.
                 */
-                for (i = mutex_id; i < ACPI_MAX_MUTEX; i++) {
+                for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                if (i == mutex_id) {
                                        ACPI_ERROR((AE_INFO,
@@ -315,7 +315,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                 * ordering rule.  This indicates a coding error somewhere in
                 * the ACPI subsystem code.
                 */
-                for (i = mutex_id; i < ACPI_MAX_MUTEX; i++) {
+                for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                if (i == mutex_id) {
                                        continue;
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index e68466de8044..e25484495e65 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -83,7 +83,8 @@ acpi_ut_get_element_length(u8 object_type,
 *
 ******************************************************************************/
-union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,
+union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char
+                                                              *module_name,
                                                              u32 line_number,
                                                              u32 component_id,
                                                              acpi_object_type
@@ -175,8 +176,8 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)
         * Create the element array. Count+1 allows the array to be null
         * terminated.
         */
-        package_elements = ACPI_ALLOCATE_ZEROED((acpi_size)
+        package_elements = ACPI_ALLOCATE_ZEROED(((acpi_size) count +
-                                                (count + 1) * sizeof(void *));
+                                                 1) * sizeof(void *));
        if (!package_elements) {
                acpi_ut_remove_reference(package_desc);
                return_PTR(NULL);
@@ -347,7 +348,7 @@ u8 acpi_ut_valid_internal_object(void *object)
 *
 ******************************************************************************/
-void *acpi_ut_allocate_object_desc_dbg(char *module_name,
+void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
                                       u32 line_number, u32 component_id)
 {
        union acpi_operand_object *object;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d089c4519d45..64c889331f3b 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -631,6 +631,76 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 *      device  : video output device (LCD, CRT, ..)
 *
 *  Return Value:
+ *      Maximum brightness level
+ *
+ *  Allocate and initialize device->brightness.
+ */
+static int
+acpi_video_init_brightness(struct acpi_video_device *device)
+{
+        union acpi_object *obj = NULL;
+        int i, max_level = 0, count = 0;
+        union acpi_object *o;
+        struct acpi_video_device_brightness *br = NULL;
+        if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
+                                                "LCD brightness level\n"));
+                goto out;
+        }
+        if (obj->package.count < 2)
+                goto out;
+        br = kzalloc(sizeof(*br), GFP_KERNEL);
+        if (!br) {
+                printk(KERN_ERR "can't allocate memory\n");
+                goto out;
+        }
+        br->levels = kmalloc(obj->package.count * sizeof *(br->levels),
+                                GFP_KERNEL);
+        if (!br->levels)
+                goto out_free;
+        for (i = 0; i < obj->package.count; i++) {
+                o = (union acpi_object *)&obj->package.elements[i];
+                if (o->type != ACPI_TYPE_INTEGER) {
+                        printk(KERN_ERR PREFIX "Invalid data\n");
+                        continue;
+                }
+                br->levels[count] = (u32) o->integer.value;
+                if (br->levels[count] > max_level)
+                        max_level = br->levels[count];
+                count++;
+        }
+        if (count < 2)
+                goto out_free_levels;
+        br->count = count;
+        device->brightness = br;
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels\n", count));
+        kfree(obj);
+        return max_level;
+out_free_levels:
+        kfree(br->levels);
+out_free:
+        kfree(br);
+out:
+        device->brightness = NULL;
+        kfree(obj);
+        return 0;
+}
+/*
+ *  Arg:
+ *      device  : video output device (LCD, CRT, ..)
+ *
+ *  Return Value:
 *      None
 *
 *  Find out all required AML methods defined under the output
@@ -640,10 +710,7 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 static void acpi_video_device_find_cap(struct acpi_video_device *device)
 {
        acpi_handle h_dummy1;
-        int i;
        u32 max_level = 0;
-        union acpi_object *obj = NULL;
-        struct acpi_video_device_brightness *br = NULL;
        memset(&device->cap, 0, sizeof(device->cap));
@@ -672,53 +739,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                device->cap._DSS = 1;
        }
-        if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
+        max_level = acpi_video_init_brightness(device);
-                if (obj->package.count >= 2) {
-                        int count = 0;
-                        union acpi_object *o;
-                        br = kzalloc(sizeof(*br), GFP_KERNEL);
-                        if (!br) {
-                                printk(KERN_ERR "can't allocate memory\n");
-                        } else {
-                                br->levels = kmalloc(obj->package.count *
-                                                     sizeof *(br->levels), GFP_KERNEL);
-                                if (!br->levels)
-                                        goto out;
-                                for (i = 0; i < obj->package.count; i++) {
-                                        o = (union acpi_object *)&obj->package.
-                                            elements[i];
-                                        if (o->type != ACPI_TYPE_INTEGER) {
-                                                printk(KERN_ERR PREFIX "Invalid data\n");
-                                                continue;
-                                        }
-                                        br->levels[count] = (u32) o->integer.value;
-                                        if (br->levels[count] > max_level)
-                                                max_level = br->levels[count];
-                                        count++;
-                                }
-                              out:
-                                if (count < 2) {
-                                        kfree(br->levels);
-                                        kfree(br);
-                                } else {
-                                        br->count = count;
-                                        device->brightness = br;
-                                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                          "found %d brightness levels\n",
-                                                          count));
-                                }
-                        }
-                }
-        } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available LCD brightness level\n"));
-        }
-        kfree(obj);
        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
                int result;
@@ -1695,6 +1716,8 @@ static void
 acpi_video_switch_brightness(struct acpi_video_device *device, int event)
 {
        unsigned long level_current, level_next;
+        if (!device->brightness)
+                return;
        acpi_video_device_lcd_get_level_current(device, &level_current);
        level_next = acpi_video_get_next_level(device, level_current, event);
        acpi_video_device_lcd_set_level(device, level_next);