172 files changed, 4203 insertions, 2340 deletions
diff --git a/Documentation/devicetree/bindings/thermal/spear-thermal.txt b/Documentation/devicetree/bindings/thermal/spear-thermal.txt
new file mode 100644
index 000000000000..93e3b67c102d
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/spear-thermal.txt
@@ -0,0 +1,14 @@
+* SPEAr Thermal
+Required properties:
+- compatible : "st,thermal-spear1340"
+- reg : Address range of the thermal registers
+- st,thermal-flags: flags used to enable thermal sensor
+Example:
+        thermal@fc000000 {
+                compatible = "st,thermal-spear1340";
+                reg = <0xfc000000 0x1000>;
+                st,thermal-flags = <0x7000>;
+        };
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index 1733ab947a95..c087dbcf3535 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -32,7 +32,8 @@ temperature) and throttle appropriate devices.
 1.1 thermal zone device interface
 1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *name,
-                int trips, void *devdata, struct thermal_zone_device_ops *ops)
+                int trips, int mask, void *devdata,
+                struct thermal_zone_device_ops *ops)
    This interface function adds a new thermal zone device (sensor) to
    /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the
@@ -40,16 +41,17 @@ temperature) and throttle appropriate devices.
    name: the thermal zone name.
    trips: the total number of trip points this thermal zone supports.
+    mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
    devdata: device private data
    ops: thermal zone device call-backs.
        .bind: bind the thermal zone device with a thermal cooling device.
        .unbind: unbind the thermal zone device with a thermal cooling device.
        .get_temp: get the current temperature of the thermal zone.
-        .get_mode: get the current mode (user/kernel) of the thermal zone.
+        .get_mode: get the current mode (enabled/disabled) of the thermal zone.
-            - "kernel" means thermal management is done in kernel.
+            - "enabled" means the kernel thermal management is enabled.
-            - "user" will prevent kernel thermal driver actions upon trip points
+            - "disabled" will prevent kernel thermal driver action upon trip points
              so that user applications can take charge of thermal management.
-        .set_mode: set the mode (user/kernel) of the thermal zone.
+        .set_mode: set the mode (enabled/disabled) of the thermal zone.
        .get_trip_type: get the type of certain trip point.
        .get_trip_temp: get the temperature above which the certain trip point
                        will be fired.
@@ -119,6 +121,7 @@ Thermal zone device sys I/F, created once it's registered:
    |---mode:                   Working mode of the thermal zone
    |---trip_point_[0-*]_temp:  Trip point temperature
    |---trip_point_[0-*]_type:  Trip point type
+    |---trip_point_[0-*]_hyst:  Hysteresis value for this trip point
 Thermal cooling device sys I/F, created once it's registered:
 /sys/class/thermal/cooling_device[0-*]:
@@ -167,14 +170,14 @@ temp
        RO, Required
 mode
-        One of the predefined values in [kernel, user].
+        One of the predefined values in [enabled, disabled].
        This file gives information about the algorithm that is currently
        managing the thermal zone. It can be either default kernel based
        algorithm or user space application.
-        kernel  = Thermal management in kernel thermal zone driver.
+        enabled         = enable Kernel Thermal management.
-        user    = Preventing kernel thermal zone driver actions upon
+        disabled        = Preventing kernel thermal zone driver actions upon
-                  trip points so that user application can take full
+                          trip points so that user application can take full
-                  charge of the thermal management.
+                          charge of the thermal management.
        RW, Optional
 trip_point_[0-*]_temp
@@ -188,6 +191,11 @@ trip_point_[0-*]_type
        thermal zone.
        RO, Optional
+trip_point_[0-*]_hyst
+        The hysteresis value for a trip point, represented as an integer
+        Unit: Celsius
+        RW, Optional
 cdev[0-*]
        Sysfs link to the thermal cooling device node where the sys I/F
        for cooling device throttling control represents.
@@ -248,7 +256,7 @@ method, the sys I/F structure will be built like this:
 |thermal_zone1:
    |---type:                   acpitz
    |---temp:                   37000
-    |---mode:                   kernel
+    |---mode:                   enabled
    |---trip_point_0_temp:      100000
    |---trip_point_0_type:      critical
    |---trip_point_1_temp:      80000
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b41de49a324..48778c985dc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -242,13 +242,6 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:      Supported
 F:      drivers/acpi/fan.c
-ACPI PROCESSOR AGGREGATOR DRIVER
-M:      Shaohua Li <shaohua.li@intel.com>
-L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-S:      Supported
-F:      drivers/acpi/acpi_pad.c
 ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index ff9f6bd48301..ac7034129f3f 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -294,7 +294,9 @@ static int acpi_ac_add(struct acpi_device *device)
        ac->charger.properties = ac_props;
        ac->charger.num_properties = ARRAY_SIZE(ac_props);
        ac->charger.get_property = get_ac_property;
-        power_supply_register(&ac->device->dev, &ac->charger);
+        result = power_supply_register(&ac->device->dev, &ac->charger);
+        if (result)
+                goto end;
        printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
               acpi_device_name(device), acpi_device_bid(device),
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index d98571385656..24c807f96636 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -341,7 +341,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 {
        struct acpi_memory_device *mem_device;
        struct acpi_device *device;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
@@ -354,15 +354,20 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                                          "\nReceived DEVICE CHECK notification for device\n"));
                if (acpi_memory_get_device(handle, &mem_device)) {
                        printk(KERN_ERR PREFIX "Cannot find driver data\n");
-                        return;
+                        break;
                }
-                if (!acpi_memory_check_device(mem_device)) {
+                if (acpi_memory_check_device(mem_device))
-                        if (acpi_memory_enable_device(mem_device))
+                        break;
-                                printk(KERN_ERR PREFIX
-                                            "Cannot enable memory device\n");
+                if (acpi_memory_enable_device(mem_device)) {
+                        printk(KERN_ERR PREFIX "Cannot enable memory device\n");
+                        break;
                }
+                ost_code = ACPI_OST_SC_SUCCESS;
                break;
        case ACPI_NOTIFY_EJECT_REQUEST:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "\nReceived EJECT REQUEST notification for device\n"));
@@ -383,19 +388,35 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                 * TBD: Can also be disabled by Callback registration
                 *      with generic sysfs driver
                 */
-                if (acpi_memory_disable_device(mem_device))
+                if (acpi_memory_disable_device(mem_device)) {
-                        printk(KERN_ERR PREFIX
+                        printk(KERN_ERR PREFIX "Disable memory device\n");
-                                    "Disable memory device\n");
+                        /*
+                         * If _EJ0 was called but failed, _OST is not
+                         * necessary.
+                         */
+                        if (mem_device->state == MEMORY_INVALID_STATE)
+                                return;
+                        break;
+                }
                /*
                 * TBD: Invoke acpi_bus_remove to cleanup data structures
                 */
-                break;
+                /* _EJ0 succeeded; _OST is not necessary */
+                return;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
-                break;
+                /* non-hotplug event; possibly handled by other handler */
+                return;
        }
+        /* Inform firmware that the hotplug operation has completed */
+        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
        return;
 }
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 1502c50273b5..af4aad6ee2eb 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -145,7 +145,7 @@ static void exit_round_robin(unsigned int tsk_index)
 }
 static unsigned int idle_pct = 5; /* percentage */
-static unsigned int round_robin_time = 10; /* second */
+static unsigned int round_robin_time = 1; /* second */
 static int power_saving_thread(void *data)
 {
        struct sched_param param = {.sched_priority = 1};
@@ -235,7 +235,7 @@ static int create_power_saving_task(void)
        ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
                (void *)(unsigned long)ps_tsk_num,
-                "power_saving/%d", ps_tsk_num);
+                "acpi_pad/%d", ps_tsk_num);
        rc = IS_ERR(ps_tsks[ps_tsk_num]) ? PTR_ERR(ps_tsks[ps_tsk_num]) : 0;
        if (!rc)
                ps_tsk_num++;
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 793b8cc8e256..0a1b3435f920 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -134,12 +134,14 @@ acpi-y +=		\
        tbinstal.o      \
        tbutils.o       \
        tbxface.o       \
+        tbxfload.o      \
        tbxfroot.o
 acpi-y +=               \
        utaddress.o     \
        utalloc.o       \
        utcopy.o        \
+        utexcep.o       \
        utdebug.o       \
        utdecode.o      \
        utdelete.o      \
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index d700f63e4701..c0a43b38c6a3 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -237,7 +237,7 @@ u32 acpi_ev_install_sci_handler(void);
 acpi_status acpi_ev_remove_sci_handler(void);
-u32 acpi_ev_initialize_sCI(u32 program_sCI);
+u32 acpi_ev_initialize_SCI(u32 program_SCI);
 ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))
 #endif                          /* __ACEVENTS_H__  */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 4f7d3f57d05c..ce79100fb5eb 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -278,8 +278,7 @@ ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache;
 /* Global handlers */
-ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_device_notify;
+ACPI_EXTERN struct acpi_global_notify_handler acpi_gbl_global_notify[2];
-ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify;
 ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;
 ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
 ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;
@@ -327,14 +326,6 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 #endif
-/* Exception codes */
-extern char const *acpi_gbl_exception_names_env[];
-extern char const *acpi_gbl_exception_names_pgm[];
-extern char const *acpi_gbl_exception_names_tbl[];
-extern char const *acpi_gbl_exception_names_aml[];
-extern char const *acpi_gbl_exception_names_ctrl[];
 /*****************************************************************************
 *
 * Namespace globals
@@ -463,4 +454,12 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;
 #endif                          /* ACPI_DEBUGGER */
+/*****************************************************************************
+ *
+ * Info/help support
+ *
+ ****************************************************************************/
+extern const struct ah_predefined_name asl_predefined_info[];
 #endif                          /* __ACGLOBAL_H__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index e3922ca20e7f..cc80fe10e8ea 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -299,7 +299,7 @@ acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state);
 * Information structure for ACPI predefined names.
 * Each entry in the table contains the following items:
 *
- * Name                 - The ACPI reserved name
+ * name                 - The ACPI reserved name
 * param_count          - Number of arguments to the method
 * expected_return_btypes - Allowed type(s) for the return value
 */
@@ -404,6 +404,13 @@ struct acpi_gpe_handler_info {
        u8 originally_enabled;  /* True if GPE was originally enabled */
 };
+/* Notify info for implicit notify, multiple device objects */
+struct acpi_gpe_notify_info {
+        struct acpi_namespace_node *device_node;        /* Device to be notified */
+        struct acpi_gpe_notify_info *next;
+};
 struct acpi_gpe_notify_object {
        struct acpi_namespace_node *node;
        struct acpi_gpe_notify_object *next;
@@ -412,7 +419,7 @@ struct acpi_gpe_notify_object {
 union acpi_gpe_dispatch_info {
        struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
        struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
-        struct acpi_gpe_notify_object device;   /* List of _PRW devices for implicit notify */
+        struct acpi_gpe_notify_info *notify_list;       /* List of _PRW devices for implicit notifies */
 };
 /*
@@ -420,7 +427,7 @@ union acpi_gpe_dispatch_info {
 * NOTE: Important to keep this struct as small as possible.
 */
 struct acpi_gpe_event_info {
-        union acpi_gpe_dispatch_info dispatch;  /* Either Method or Handler */
+        union acpi_gpe_dispatch_info dispatch;  /* Either Method, Handler, or notify_list */
        struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
        u8 flags;               /* Misc info about this GPE */
        u8 gpe_number;          /* This GPE */
@@ -600,13 +607,22 @@ acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
 typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
+/* Global handlers for AML Notifies */
+struct acpi_global_notify_handler {
+        acpi_notify_handler handler;
+        void *context;
+};
 /*
 * Notify info - used to pass info to the deferred notify
 * handler/dispatcher.
 */
 struct acpi_notify_info {
-        ACPI_STATE_COMMON struct acpi_namespace_node *node;
+        ACPI_STATE_COMMON u8 handler_list_id;
-        union acpi_operand_object *handler_obj;
+        struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_list_head;
+        struct acpi_global_notify_handler *global;
 };
 /* Generic state is union of structs above */
@@ -718,7 +734,7 @@ struct acpi_parse_obj_named {
        u32 name;               /* 4-byte name or zero if no name */
 };
-/* This version is used by the i_aSL compiler only */
+/* This version is used by the iASL compiler only */
 #define ACPI_MAX_PARSEOP_NAME   20
@@ -787,6 +803,7 @@ struct acpi_parse_state {
 #define ACPI_PARSEOP_IGNORE             0x01
 #define ACPI_PARSEOP_PARAMLIST          0x02
 #define ACPI_PARSEOP_EMPTY_TERMLIST     0x04
+#define ACPI_PARSEOP_PREDEF_CHECKED     0x08
 #define ACPI_PARSEOP_SPECIAL            0x10
 /*****************************************************************************
@@ -1075,4 +1092,18 @@ struct acpi_debug_mem_block {
 #define ACPI_MEM_LIST_MAX               1
 #define ACPI_NUM_MEM_LISTS              2
+/*****************************************************************************
+ *
+ * Info/help support
+ *
+ ****************************************************************************/
+struct ah_predefined_name {
+        char *name;
+        char *description;
+#ifndef ACPI_ASL_COMPILER
+        char *action;
+#endif
+};
 #endif                          /* __ACLOCAL_H__ */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index f119f473f71a..832b6198652e 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -62,7 +62,7 @@
 * printf() format helpers
 */
-/* Split 64-bit integer into two 32-bit values. Use with %8.8_x%8.8_x */
+/* Split 64-bit integer into two 32-bit values. Use with %8.8X%8.8X */
 #define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)
@@ -283,8 +283,8 @@
 #define ACPI_INSERT_BITS(target, mask, source)          target = ((target & (~(mask))) | (source & mask))
 /*
- * A struct acpi_namespace_node can appear in some contexts
+ * An object of type struct acpi_namespace_node can appear in some contexts
- * where a pointer to a union acpi_operand_object can also
+ * where a pointer to an object of type union acpi_operand_object can also
 * appear. This macro is used to distinguish them.
 *
 * The "Descriptor" field is the first field in both structures.
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index c065078ca83b..364a1303fb8f 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -113,8 +113,8 @@ struct acpi_object_integer {
 };
 /*
- * Note: The String and Buffer object must be identical through the Pointer
+ * Note: The String and Buffer object must be identical through the
- * and length elements.  There is code that depends on this.
+ * pointer and length elements. There is code that depends on this.
 *
 * Fields common to both Strings and Buffers
 */
@@ -206,8 +206,7 @@ struct acpi_object_method {
 * Common fields for objects that support ASL notifications
 */
 #define ACPI_COMMON_NOTIFY_INFO \
-        union acpi_operand_object       *system_notify;     /* Handler for system notifies */\
+        union acpi_operand_object       *notify_list[2];    /* Handlers for system/device notifies */\
-        union acpi_operand_object       *device_notify;     /* Handler for driver notifies */\
        union acpi_operand_object       *handler;       /* Handler for Address space */
 struct acpi_object_notify_common {      /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
@@ -296,10 +295,10 @@ struct acpi_object_buffer_field {
 struct acpi_object_notify_handler {
        ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *node;     /* Parent device */
-        u32 handler_type;
+        u32 handler_type;       /* Type: Device/System/Both */
-        acpi_notify_handler handler;
+        acpi_notify_handler handler;    /* Handler address */
        void *context;
-        struct acpi_object_notify_handler *next;
+        union acpi_operand_object *next[2];     /* Device and System handler lists */
 };
 struct acpi_object_addr_handler {
@@ -382,7 +381,7 @@ struct acpi_object_cache_list {
 /******************************************************************************
 *
- * union acpi_operand_object Descriptor - a giant union of all of the above
+ * union acpi_operand_object descriptor - a giant union of all of the above
 *
 *****************************************************************************/
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index bbb34c9be4e8..3080c017f5ba 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -140,7 +140,7 @@ enum acpi_return_package_types {
 *
 * The main entries in the table each contain the following items:
 *
- * Name                 - The ACPI reserved name
+ * name                 - The ACPI reserved name
 * param_count          - Number of arguments to the method
 * expected_btypes      - Allowed type(s) for the return value.
 *                        0 means that no return value is expected.
@@ -511,14 +511,14 @@ static const union acpi_predefined_info predefined_names[] =
        {{"_TMP", 0, ACPI_RTYPE_INTEGER}},
        {{"_TPC", 0, ACPI_RTYPE_INTEGER}},
        {{"_TPT", 1, 0}},
-        {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2_ref/6_int */
+        {{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
                          {{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
-        {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int with count */
+        {{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int with count */
                          {{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
        {{"_TSP", 0, ACPI_RTYPE_INTEGER}},
-        {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int */
+        {{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int */
                          {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
        {{"_TST", 0, ACPI_RTYPE_INTEGER}},
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 0404df605bc1..f196e2c9a71f 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -68,7 +68,7 @@
 #define ACPI_WALK_METHOD            0x01
 #define ACPI_WALK_METHOD_RESTART    0x02
-/* Flags for i_aSL compiler only */
+/* Flags for iASL compiler only */
 #define ACPI_WALK_CONST_REQUIRED    0x10
 #define ACPI_WALK_CONST_OPTIONAL    0x20
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 925ccf22101b..5035327ebccc 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -460,6 +460,8 @@ acpi_ut_short_divide(u64 in_dividend,
 /*
 * utmisc
 */
+void ut_convert_backslashes(char *pathname);
 const char *acpi_ut_validate_exception(acpi_status status);
 u8 acpi_ut_is_pci_root_bridge(char *id);
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 905280fec0fa..c26f8ff6c3b9 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -182,7 +182,7 @@
 /*
 * Combination opcodes (actually two one-byte opcodes)
- * Used by the disassembler and i_aSL compiler
+ * Used by the disassembler and iASL compiler
 */
 #define AML_LGREATEREQUAL_OP        (u16) 0x9295
 #define AML_LLESSEQUAL_OP           (u16) 0x9294
@@ -280,7 +280,7 @@
 /* Multiple/complex types */
-#define ARGI_DATAOBJECT             0x12        /* Buffer, String, package or reference to a Node - Used only by size_of operator */
+#define ARGI_DATAOBJECT             0x12        /* Buffer, String, package or reference to a node - Used only by size_of operator */
 #define ARGI_COMPLEXOBJ             0x13        /* Buffer, String, or package (Used by INDEX op only) */
 #define ARGI_REF_OR_STRING          0x14        /* Reference or String (Used by DEREFOF op only) */
 #define ARGI_REGION_OR_BUFFER       0x15        /* Used by LOAD op only */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 7b2128f274e7..af4947956ec2 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -98,7 +98,7 @@
 #define ACPI_RESTAG_TRANSLATION                 "_TRA"
 #define ACPI_RESTAG_TRANSTYPE                   "_TRS"  /* Sparse(1), Dense(0) */
 #define ACPI_RESTAG_TYPE                        "_TTP"  /* Translation(1), Static (0) */
-#define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8_and16(1), 16(2) */
+#define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8And16(1), 16(2) */
 #define ACPI_RESTAG_VENDORDATA                  "_VEN"
 /* Default sizes for "small" resource descriptors */
@@ -235,7 +235,7 @@ AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_ADDRESS_COMMON};
 struct aml_resource_extended_address64 {
        AML_RESOURCE_LARGE_HEADER_COMMON
-            AML_RESOURCE_ADDRESS_COMMON u8 revision_iD;
+            AML_RESOURCE_ADDRESS_COMMON u8 revision_ID;
        u8 reserved;
        u64 granularity;
        u64 minimum;
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 80eb1900297f..c8b5e2565b98 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -62,7 +62,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_ds_execute_arguments
 *
- * PARAMETERS:  Node                - Object NS node
+ * PARAMETERS:  node                - Object NS node
 *              scope_node          - Parent NS node
 *              aml_length          - Length of executable AML
 *              aml_start           - Pointer to the AML
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index effe4ca1133f..465f02134b89 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("dscontrol")
 * FUNCTION:    acpi_ds_exec_begin_control_op
 *
 * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              Op              - The control Op
+ *              op              - The control Op
 *
 * RETURN:      Status
 *
@@ -153,7 +153,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_exec_end_control_op
 *
 * PARAMETERS:  walk_list       - The list that owns the walk stack
- *              Op              - The control Op
+ *              op              - The control Op
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index cd243cf2cab2..3da6fd8530c5 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -53,16 +53,84 @@
 ACPI_MODULE_NAME("dsfield")
 /* Local prototypes */
+#ifdef ACPI_ASL_COMPILER
+#include "acdisasm.h"
+static acpi_status
+acpi_ds_create_external_region(acpi_status lookup_status,
+                               union acpi_parse_object *op,
+                               char *path,
+                               struct acpi_walk_state *walk_state,
+                               struct acpi_namespace_node **node);
+#endif
 static acpi_status
 acpi_ds_get_field_names(struct acpi_create_field_info *info,
                        struct acpi_walk_state *walk_state,
                        union acpi_parse_object *arg);
+#ifdef ACPI_ASL_COMPILER
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_create_external_region (iASL Disassembler only)
+ *
+ * PARAMETERS:  lookup_status   - Status from ns_lookup operation
+ *              op              - Op containing the Field definition and args
+ *              path            - Pathname of the region
+ *  `           walk_state      - Current method state
+ *              node            - Where the new region node is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Add region to the external list if NOT_FOUND. Create a new
+ *              region node/object.
+ *
+ ******************************************************************************/
+static acpi_status
+acpi_ds_create_external_region(acpi_status lookup_status,
+                               union acpi_parse_object *op,
+                               char *path,
+                               struct acpi_walk_state *walk_state,
+                               struct acpi_namespace_node **node)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        if (lookup_status != AE_NOT_FOUND) {
+                return (lookup_status);
+        }
+        /*
+         * Table disassembly:
+         * operation_region not found. Generate an External for it, and
+         * insert the name into the namespace.
+         */
+        acpi_dm_add_to_external_list(op, path, ACPI_TYPE_REGION, 0);
+        status = acpi_ns_lookup(walk_state->scope_info, path, ACPI_TYPE_REGION,
+                                ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT,
+                                walk_state, node);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+        /* Must create and install a region object for the new node */
+        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_REGION);
+        if (!obj_desc) {
+                return (AE_NO_MEMORY);
+        }
+        obj_desc->region.node = *node;
+        status = acpi_ns_attach_object(*node, obj_desc, ACPI_TYPE_REGION);
+        return (status);
+}
+#endif
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ds_create_buffer_field
 *
- * PARAMETERS:  Op                  - Current parse op (create_xXField)
+ * PARAMETERS:  op                  - Current parse op (create_XXField)
 *              walk_state          - Current state
 *
 * RETURN:      Status
@@ -99,7 +167,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                arg = acpi_ps_get_arg(op, 3);
        } else {
-                /* For all other create_xXXField operators, name is the 3rd argument */
+                /* For all other create_XXXField operators, name is the 3rd argument */
                arg = acpi_ps_get_arg(op, 2);
        }
@@ -203,9 +271,9 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
 *
 * FUNCTION:    acpi_ds_get_field_names
 *
- * PARAMETERS:  Info            - create_field info structure
+ * PARAMETERS:  info            - create_field info structure
 *  `           walk_state      - Current method state
- *              Arg             - First parser arg for the field name list
+ *              arg             - First parser arg for the field name list
 *
 * RETURN:      Status
 *
@@ -234,10 +302,10 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
        while (arg) {
                /*
                 * Four types of field elements are handled:
-                 * 1) Name - Enters a new named field into the namespace
+                 * 1) name - Enters a new named field into the namespace
-                 * 2) Offset - specifies a bit offset
+                 * 2) offset - specifies a bit offset
                 * 3) access_as - changes the access mode/attributes
-                 * 4) Connection - Associate a resource template with the field
+                 * 4) connection - Associate a resource template with the field
                 */
                switch (arg->common.aml_opcode) {
                case AML_INT_RESERVEDFIELD_OP:
@@ -389,7 +457,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 *
 * FUNCTION:    acpi_ds_create_field
 *
- * PARAMETERS:  Op              - Op containing the Field definition and args
+ * PARAMETERS:  op              - Op containing the Field definition and args
 *              region_node     - Object for the containing Operation Region
 *  `           walk_state      - Current method state
 *
@@ -413,12 +481,19 @@ acpi_ds_create_field(union acpi_parse_object *op,
        /* First arg is the name of the parent op_region (must already exist) */
        arg = op->common.value.arg;
        if (!region_node) {
                status =
                    acpi_ns_lookup(walk_state->scope_info,
                                   arg->common.value.name, ACPI_TYPE_REGION,
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                   walk_state, &region_node);
+#ifdef ACPI_ASL_COMPILER
+                status = acpi_ds_create_external_region(status, arg,
+                                                        arg->common.value.name,
+                                                        walk_state,
+                                                        &region_node);
+#endif
                if (ACPI_FAILURE(status)) {
                        ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                        return_ACPI_STATUS(status);
@@ -446,7 +521,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
 *
 * FUNCTION:    acpi_ds_init_field_objects
 *
- * PARAMETERS:  Op              - Op containing the Field definition and args
+ * PARAMETERS:  op              - Op containing the Field definition and args
 *  `           walk_state      - Current method state
 *
 * RETURN:      Status
@@ -561,7 +636,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
 *
 * FUNCTION:    acpi_ds_create_bank_field
 *
- * PARAMETERS:  Op              - Op containing the Field definition and args
+ * PARAMETERS:  op              - Op containing the Field definition and args
 *              region_node     - Object for the containing Operation Region
 *              walk_state      - Current method state
 *
@@ -591,6 +666,12 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
                                   arg->common.value.name, ACPI_TYPE_REGION,
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                   walk_state, &region_node);
+#ifdef ACPI_ASL_COMPILER
+                status = acpi_ds_create_external_region(status, arg,
+                                                        arg->common.value.name,
+                                                        walk_state,
+                                                        &region_node);
+#endif
                if (ACPI_FAILURE(status)) {
                        ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                        return_ACPI_STATUS(status);
@@ -645,7 +726,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
 *
 * FUNCTION:    acpi_ds_create_index_field
 *
- * PARAMETERS:  Op              - Op containing the Field definition and args
+ * PARAMETERS:  op              - Op containing the Field definition and args
 *              region_node     - Object for the containing Operation Region
 *  `           walk_state      - Current method state
 *
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index 9e5ac7f780a7..87eff701ecfa 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -60,8 +60,8 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
 * FUNCTION:    acpi_ds_init_one_object
 *
 * PARAMETERS:  obj_handle      - Node for the object
- *              Level           - Current nesting level
+ *              level           - Current nesting level
- *              Context         - Points to a init info struct
+ *              context         - Points to a init info struct
 *              return_value    - Not used
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 00f5dab5bcc0..aa9a5d4e4052 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -61,7 +61,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc);
 *
 * FUNCTION:    acpi_ds_method_error
 *
- * PARAMETERS:  Status          - Execution status
+ * PARAMETERS:  status          - Execution status
 *              walk_state      - Current state
 *
 * RETURN:      Status
@@ -306,9 +306,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
 *
 * FUNCTION:    acpi_ds_call_control_method
 *
- * PARAMETERS:  Thread              - Info for this thread
+ * PARAMETERS:  thread              - Info for this thread
 *              this_walk_state     - Current walk state
- *              Op                  - Current Op to be walked
+ *              op                  - Current Op to be walked
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index b40bd507be5d..8d55cebaa656 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -177,7 +177,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)
 *
 * FUNCTION:    acpi_ds_method_data_init_args
 *
- * PARAMETERS:  *Params         - Pointer to a parameter list for the method
+ * PARAMETERS:  *params         - Pointer to a parameter list for the method
 *              max_param_count - The arg count for this method
 *              walk_state      - Current walk state object
 *
@@ -232,11 +232,11 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params,
 *
 * FUNCTION:    acpi_ds_method_data_get_node
 *
- * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
 *                                    ACPI_REFCLASS_ARG
- *              Index               - Which Local or Arg whose type to get
+ *              index               - Which Local or Arg whose type to get
 *              walk_state          - Current walk state object
- *              Node                - Where the node is returned.
+ *              node                - Where the node is returned.
 *
 * RETURN:      Status and node
 *
@@ -296,10 +296,10 @@ acpi_ds_method_data_get_node(u8 type,
 *
 * FUNCTION:    acpi_ds_method_data_set_value
 *
- * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
 *                                    ACPI_REFCLASS_ARG
- *              Index               - Which Local or Arg to get
+ *              index               - Which Local or Arg to get
- *              Object              - Object to be inserted into the stack entry
+ *              object              - Object to be inserted into the stack entry
 *              walk_state          - Current walk state object
 *
 * RETURN:      Status
@@ -336,7 +336,7 @@ acpi_ds_method_data_set_value(u8 type,
         * Increment ref count so object can't be deleted while installed.
         * NOTE: We do not copy the object in order to preserve the call by
         * reference semantics of ACPI Control Method invocation.
-         * (See ACPI Specification 2.0_c)
+         * (See ACPI Specification 2.0C)
         */
        acpi_ut_add_reference(object);
@@ -350,9 +350,9 @@ acpi_ds_method_data_set_value(u8 type,
 *
 * FUNCTION:    acpi_ds_method_data_get_value
 *
- * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
 *                                    ACPI_REFCLASS_ARG
- *              Index               - Which local_var or argument to get
+ *              index               - Which localVar or argument to get
 *              walk_state          - Current walk state object
 *              dest_desc           - Where Arg or Local value is returned
 *
@@ -458,9 +458,9 @@ acpi_ds_method_data_get_value(u8 type,
 *
 * FUNCTION:    acpi_ds_method_data_delete_value
 *
- * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
 *                                    ACPI_REFCLASS_ARG
- *              Index               - Which local_var or argument to delete
+ *              index               - Which localVar or argument to delete
 *              walk_state          - Current walk state object
 *
 * RETURN:      None
@@ -515,9 +515,9 @@ acpi_ds_method_data_delete_value(u8 type,
 *
 * FUNCTION:    acpi_ds_store_object_to_local
 *
- * PARAMETERS:  Type                - Either ACPI_REFCLASS_LOCAL or
+ * PARAMETERS:  type                - Either ACPI_REFCLASS_LOCAL or
 *                                    ACPI_REFCLASS_ARG
- *              Index               - Which Local or Arg to set
+ *              index               - Which Local or Arg to set
 *              obj_desc            - Value to be stored
 *              walk_state          - Current walk state
 *
@@ -670,8 +670,8 @@ acpi_ds_store_object_to_local(u8 type,
 *
 * FUNCTION:    acpi_ds_method_data_get_type
 *
- * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP
+ * PARAMETERS:  opcode              - Either AML_LOCAL_OP or AML_ARG_OP
- *              Index               - Which Local or Arg whose type to get
+ *              index               - Which Local or Arg whose type to get
 *              walk_state          - Current walk state object
 *
 * RETURN:      Data type of current value of the selected Arg or Local
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index d7045ca3e32a..68592dd34960 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -64,7 +64,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_build_internal_object
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Op              - Parser object to be translated
+ *              op              - Parser object to be translated
 *              obj_desc_ptr    - Where the ACPI internal object is returned
 *
 * RETURN:      Status
@@ -250,7 +250,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_build_internal_buffer_obj
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Op              - Parser object to be translated
+ *              op              - Parser object to be translated
 *              buffer_length   - Length of the buffer
 *              obj_desc_ptr    - Where the ACPI internal object is returned
 *
@@ -354,7 +354,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_build_internal_package_obj
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Op              - Parser object to be translated
+ *              op              - Parser object to be translated
 *              element_count   - Number of elements in the package - this is
 *                                the num_elements argument to Package()
 *              obj_desc_ptr    - Where the ACPI internal object is returned
@@ -547,8 +547,8 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_create_node
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Node            - NS Node to be initialized
+ *              node            - NS Node to be initialized
- *              Op              - Parser object to be translated
+ *              op              - Parser object to be translated
 *
 * RETURN:      Status
 *
@@ -611,8 +611,8 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_init_object_from_op
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Op              - Parser op used to init the internal object
+ *              op              - Parser op used to init the internal object
- *              Opcode          - AML opcode associated with the object
+ *              opcode          - AML opcode associated with the object
 *              ret_obj_desc    - Namespace object to be initialized
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index e5eff7585102..aa34d8984d34 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -286,7 +286,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
 * FUNCTION:    acpi_ds_eval_buffer_field_operands
 *
 * PARAMETERS:  walk_state      - Current walk
- *              Op              - A valid buffer_field Op object
+ *              op              - A valid buffer_field Op object
 *
 * RETURN:      Status
 *
@@ -370,7 +370,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_eval_region_operands
 *
 * PARAMETERS:  walk_state      - Current walk
- *              Op              - A valid region Op object
+ *              op              - A valid region Op object
 *
 * RETURN:      Status
 *
@@ -397,7 +397,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
         */
        node = op->common.node;
-        /* next_op points to the op that holds the space_iD */
+        /* next_op points to the op that holds the space_ID */
        next_op = op->common.value.arg;
@@ -461,7 +461,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_eval_table_region_operands
 *
 * PARAMETERS:  walk_state      - Current walk
- *              Op              - A valid region Op object
+ *              op              - A valid region Op object
 *
 * RETURN:      Status
 *
@@ -560,7 +560,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_eval_data_object_operands
 *
 * PARAMETERS:  walk_state      - Current walk
- *              Op              - A valid data_object Op object
+ *              op              - A valid data_object Op object
 *              obj_desc        - data_object
 *
 * RETURN:      Status
@@ -662,7 +662,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ds_eval_bank_field_operands
 *
 * PARAMETERS:  walk_state      - Current walk
- *              Op              - A valid bank_field Op object
+ *              op              - A valid bank_field Op object
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 1abcda31037f..73a5447475f5 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -157,7 +157,7 @@ acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,
 *
 * FUNCTION:    acpi_ds_is_result_used
 *
- * PARAMETERS:  Op                  - Current Op
+ * PARAMETERS:  op                  - Current Op
 *              walk_state          - Current State
 *
 * RETURN:      TRUE if result is used, FALSE otherwise
@@ -323,7 +323,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 *
 * FUNCTION:    acpi_ds_delete_result_if_not_used
 *
- * PARAMETERS:  Op              - Current parse Op
+ * PARAMETERS:  op              - Current parse Op
 *              result_obj      - Result of the operation
 *              walk_state      - Current state
 *
@@ -445,7 +445,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
 * FUNCTION:    acpi_ds_create_operand
 *
 * PARAMETERS:  walk_state      - Current walk state
- *              Arg             - Parse object for the argument
+ *              arg             - Parse object for the argument
 *              arg_index       - Which argument (zero based)
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index 9e9490a9cbf0..f6c4295470ae 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -85,8 +85,8 @@ void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)
 *
 * FUNCTION:    acpi_ds_scope_stack_push
 *
- * PARAMETERS:  Node            - Name to be made current
+ * PARAMETERS:  node            - Name to be made current
- *              Type            - Type of frame being pushed
+ *              type            - Type of frame being pushed
 *              walk_state      - Current state
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index c9c2ac13e7cc..d0e6555061e4 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -58,7 +58,7 @@ static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *ws);
 *
 * FUNCTION:    acpi_ds_result_pop
 *
- * PARAMETERS:  Object              - Where to return the popped object
+ * PARAMETERS:  object              - Where to return the popped object
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -132,7 +132,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
 *
 * FUNCTION:    acpi_ds_result_push
 *
- * PARAMETERS:  Object              - Where to return the popped object
+ * PARAMETERS:  object              - Where to return the popped object
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -296,7 +296,7 @@ static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state)
 *
 * FUNCTION:    acpi_ds_obj_stack_push
 *
- * PARAMETERS:  Object              - Object to push
+ * PARAMETERS:  object              - Object to push
 *              walk_state          - Current Walk state
 *
 * RETURN:      Status
@@ -433,7 +433,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
 *
 * FUNCTION:    acpi_ds_get_current_walk_state
 *
- * PARAMETERS:  Thread          - Get current active state for this Thread
+ * PARAMETERS:  thread          - Get current active state for this Thread
 *
 * RETURN:      Pointer to the current walk state
 *
@@ -462,7 +462,7 @@ struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
 * FUNCTION:    acpi_ds_push_walk_state
 *
 * PARAMETERS:  walk_state      - State to push
- *              Thread          - Thread state object
+ *              thread          - Thread state object
 *
 * RETURN:      None
 *
@@ -486,7 +486,7 @@ acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
 *
 * FUNCTION:    acpi_ds_pop_walk_state
 *
- * PARAMETERS:  Thread      - Current thread state
+ * PARAMETERS:  thread      - Current thread state
 *
 * RETURN:      A walk_state object popped from the thread's stack
 *
@@ -525,9 +525,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
 * FUNCTION:    acpi_ds_create_walk_state
 *
 * PARAMETERS:  owner_id        - ID for object creation
- *              Origin          - Starting point for this walk
+ *              origin          - Starting point for this walk
 *              method_desc     - Method object
- *              Thread          - Current thread state
+ *              thread          - Current thread state
 *
 * RETURN:      Pointer to the new walk state.
 *
@@ -578,11 +578,11 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union
 * FUNCTION:    acpi_ds_init_aml_walk
 *
 * PARAMETERS:  walk_state      - New state to be initialized
- *              Op              - Current parse op
+ *              op              - Current parse op
 *              method_node     - Control method NS node, if any
 *              aml_start       - Start of AML
 *              aml_length      - Length of AML
- *              Info            - Method info block (params, etc.)
+ *              info            - Method info block (params, etc.)
 *              pass_number     - 1, 2, or 3
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index 07e4dc44f81c..d4acfbbe5b29 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -251,7 +251,7 @@ u32 acpi_ev_fixed_event_detect(void)
 *
 * FUNCTION:    acpi_ev_fixed_event_dispatch
 *
- * PARAMETERS:  Event               - Event type
+ * PARAMETERS:  event               - Event type
 *
 * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED
 *
diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c
index cfeab38795d8..af14a7137632 100644
--- a/drivers/acpi/acpica/evglock.c
+++ b/drivers/acpi/acpica/evglock.c
@@ -135,7 +135,7 @@ acpi_status acpi_ev_remove_global_lock_handler(void)
 *
 * FUNCTION:    acpi_ev_global_lock_handler
 *
- * PARAMETERS:  Context         - From thread interface, not used
+ * PARAMETERS:  context         - From thread interface, not used
 *
 * RETURN:      ACPI_INTERRUPT_HANDLED
 *
@@ -182,7 +182,7 @@ static u32 acpi_ev_global_lock_handler(void *context)
 *
 * FUNCTION:    acpi_ev_acquire_global_lock
 *
- * PARAMETERS:  Timeout         - Max time to wait for the lock, in millisec.
+ * PARAMETERS:  timeout         - Max time to wait for the lock, in millisec.
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 8ba0e5f17091..afbd5cb391f6 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -466,7 +466,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
        acpi_status status;
        struct acpi_gpe_event_info *local_gpe_event_info;
        struct acpi_evaluate_info *info;
-        struct acpi_gpe_notify_object *notify_object;
+        struct acpi_gpe_notify_info *notify;
        ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
@@ -517,17 +517,17 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                 * completes. The notify handlers are NOT invoked synchronously
                 * from this thread -- because handlers may in turn run other
                 * control methods.
+                 *
+                 * June 2012: Expand implicit notify mechanism to support
+                 * notifies on multiple device objects.
                 */
-                status = acpi_ev_queue_notify_request(
+                notify = local_gpe_event_info->dispatch.notify_list;
-                                local_gpe_event_info->dispatch.device.node,
+                while (ACPI_SUCCESS(status) && notify) {
-                                ACPI_NOTIFY_DEVICE_WAKE);
+                        status =
+                            acpi_ev_queue_notify_request(notify->device_node,
-                notify_object = local_gpe_event_info->dispatch.device.next;
+                                                         ACPI_NOTIFY_DEVICE_WAKE);
-                while (ACPI_SUCCESS(status) && notify_object) {
-                        status = acpi_ev_queue_notify_request(
+                        notify = notify->next;
-                                        notify_object->node,
-                                        ACPI_NOTIFY_DEVICE_WAKE);
-                        notify_object = notify_object->next;
                }
                break;
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 23a3ca86b2eb..8cf4c104c7b7 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -318,7 +318,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 * FUNCTION:    acpi_ev_create_gpe_block
 *
 * PARAMETERS:  gpe_device          - Handle to the parent GPE block
- *              gpe_block_address   - Address and space_iD
+ *              gpe_block_address   - Address and space_ID
 *              register_count      - Number of GPE register pairs in the block
 *              gpe_block_base_number - Starting GPE number for the block
 *              interrupt_number    - H/W interrupt for the block
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 3c43796b8361..cb50dd91bc18 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("evgpeutil")
 * FUNCTION:    acpi_ev_walk_gpe_list
 *
 * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
- *              Context             - Value passed to callback
+ *              context             - Value passed to callback
 *
 * RETURN:      Status
 *
@@ -347,6 +347,8 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                            void *context)
 {
        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_gpe_notify_info *notify;
+        struct acpi_gpe_notify_info *next;
        u32 i;
        u32 j;
@@ -365,10 +367,28 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                            ACPI_GPE_DISPATCH_HANDLER) {
+                                /* Delete an installed handler block */
                                ACPI_FREE(gpe_event_info->dispatch.handler);
                                gpe_event_info->dispatch.handler = NULL;
                                gpe_event_info->flags &=
                                    ~ACPI_GPE_DISPATCH_MASK;
+                        } else if ((gpe_event_info->
+                                 flags & ACPI_GPE_DISPATCH_MASK) ==
+                                ACPI_GPE_DISPATCH_NOTIFY) {
+                                /* Delete the implicit notification device list */
+                                notify = gpe_event_info->dispatch.notify_list;
+                                while (notify) {
+                                        next = notify->next;
+                                        ACPI_FREE(notify);
+                                        notify = next;
+                                }
+                                gpe_event_info->dispatch.notify_list = NULL;
+                                gpe_event_info->flags &=
+                                    ~ACPI_GPE_DISPATCH_MASK;
                        }
                }
        }
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 51ef9f5e002d..51f537937c1f 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -56,7 +56,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context);
 *
 * FUNCTION:    acpi_ev_is_notify_object
 *
- * PARAMETERS:  Node            - Node to check
+ * PARAMETERS:  node            - Node to check
 *
 * RETURN:      TRUE if notifies allowed on this object
 *
@@ -86,7 +86,7 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node)
 *
 * FUNCTION:    acpi_ev_queue_notify_request
 *
- * PARAMETERS:  Node            - NS node for the notified object
+ * PARAMETERS:  node            - NS node for the notified object
 *              notify_value    - Value from the Notify() request
 *
 * RETURN:      Status
@@ -101,102 +101,77 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                             u32 notify_value)
 {
        union acpi_operand_object *obj_desc;
-        union acpi_operand_object *handler_obj = NULL;
+        union acpi_operand_object *handler_list_head = NULL;
-        union acpi_generic_state *notify_info;
+        union acpi_generic_state *info;
+        u8 handler_list_id = 0;
        acpi_status status = AE_OK;
        ACPI_FUNCTION_NAME(ev_queue_notify_request);
-        /*
+        /* Are Notifies allowed on this object? */
-         * For value 0x03 (Ejection Request), may need to run a device method.
-         * For value 0x02 (Device Wake), if _PRW exists, may need to run
-         *   the _PS0 method.
-         * For value 0x80 (Status Change) on the power button or sleep button,
-         *   initiate soft-off or sleep operation.
-         *
-         * For all cases, simply dispatch the notify to the handler.
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
-                          acpi_ut_get_node_name(node),
-                          acpi_ut_get_type_name(node->type), notify_value,
-                          acpi_ut_get_notify_name(notify_value), node));
-        /* Get the notify object attached to the NS Node */
+        if (!acpi_ev_is_notify_object(node)) {
+                return (AE_TYPE);
-        obj_desc = acpi_ns_get_attached_object(node);
+        }
-        if (obj_desc) {
-                /* We have the notify object, Get the correct handler */
-                switch (node->type) {
-                        /* Notify is allowed only on these types */
+        /* Get the correct notify list type (System or Device) */
-                case ACPI_TYPE_DEVICE:
+        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
-                case ACPI_TYPE_THERMAL:
+                handler_list_id = ACPI_SYSTEM_HANDLER_LIST;
-                case ACPI_TYPE_PROCESSOR:
+        } else {
+                handler_list_id = ACPI_DEVICE_HANDLER_LIST;
+        }
-                        if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+        /* Get the notify object attached to the namespace Node */
-                                handler_obj =
-                                    obj_desc->common_notify.system_notify;
-                        } else {
-                                handler_obj =
-                                    obj_desc->common_notify.device_notify;
-                        }
-                        break;
-                default:
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (obj_desc) {
-                        /* All other types are not supported */
+                /* We have an attached object, Get the correct handler list */
-                        return (AE_TYPE);
+                handler_list_head =
-                }
+                    obj_desc->common_notify.notify_list[handler_list_id];
        }
        /*
-         * If there is a handler to run, schedule the dispatcher.
+         * If there is no notify handler (Global or Local)
-         * Check for:
+         * for this object, just ignore the notify
-         * 1) Global system notify handler
-         * 2) Global device notify handler
-         * 3) Per-device notify handler
         */
-        if ((acpi_gbl_system_notify.handler &&
+        if (!acpi_gbl_global_notify[handler_list_id].handler
-             (notify_value <= ACPI_MAX_SYS_NOTIFY)) ||
+            && !handler_list_head) {
-            (acpi_gbl_device_notify.handler &&
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-             (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {
+                                  "No notify handler for Notify, ignoring (%4.4s, %X) node %p\n",
-                notify_info = acpi_ut_create_generic_state();
+                                  acpi_ut_get_node_name(node), notify_value,
-                if (!notify_info) {
+                                  node));
-                        return (AE_NO_MEMORY);
-                }
-                if (!handler_obj) {
+                return (AE_OK);
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+        }
-                                          "Executing system notify handler for Notify (%4.4s, %X) "
-                                          "node %p\n",
-                                          acpi_ut_get_node_name(node),
-                                          notify_value, node));
-                }
-                notify_info->common.descriptor_type =
+        /* Setup notify info and schedule the notify dispatcher */
-                    ACPI_DESC_TYPE_STATE_NOTIFY;
-                notify_info->notify.node = node;
-                notify_info->notify.value = (u16) notify_value;
-                notify_info->notify.handler_obj = handler_obj;
-                status =
+        info = acpi_ut_create_generic_state();
-                    acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
+        if (!info) {
-                                    notify_info);
+                return (AE_NO_MEMORY);
-                if (ACPI_FAILURE(status)) {
+        }
-                        acpi_ut_delete_generic_state(notify_info);
-                }
-        } else {
-                /* There is no notify handler (per-device or system) for this device */
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+        info->common.descriptor_type = ACPI_DESC_TYPE_STATE_NOTIFY;
-                                  "No notify handler for Notify (%4.4s, %X) node %p\n",
-                                  acpi_ut_get_node_name(node), notify_value,
+        info->notify.node = node;
-                                  node));
+        info->notify.value = (u16)notify_value;
+        info->notify.handler_list_id = handler_list_id;
+        info->notify.handler_list_head = handler_list_head;
+        info->notify.global = &acpi_gbl_global_notify[handler_list_id];
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                          "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
+                          acpi_ut_get_node_name(node),
+                          acpi_ut_get_type_name(node->type), notify_value,
+                          acpi_ut_get_notify_name(notify_value), node));
+        status = acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
+                                 info);
+        if (ACPI_FAILURE(status)) {
+                acpi_ut_delete_generic_state(info);
        }
        return (status);
@@ -206,7 +181,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
 *
 * FUNCTION:    acpi_ev_notify_dispatch
 *
- * PARAMETERS:  Context         - To be passed to the notify handler
+ * PARAMETERS:  context         - To be passed to the notify handler
 *
 * RETURN:      None.
 *
@@ -217,60 +192,34 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
 static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
 {
-        union acpi_generic_state *notify_info =
+        union acpi_generic_state *info = (union acpi_generic_state *)context;
-            (union acpi_generic_state *)context;
-        acpi_notify_handler global_handler = NULL;
-        void *global_context = NULL;
        union acpi_operand_object *handler_obj;
        ACPI_FUNCTION_ENTRY();
-        /*
+        /* Invoke a global notify handler if installed */
-         * We will invoke a global notify handler if installed. This is done
-         * _before_ we invoke the per-device handler attached to the device.
-         */
-        if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) {
-                /* Global system notification handler */
-                if (acpi_gbl_system_notify.handler) {
-                        global_handler = acpi_gbl_system_notify.handler;
-                        global_context = acpi_gbl_system_notify.context;
-                }
-        } else {
-                /* Global driver notification handler */
-                if (acpi_gbl_device_notify.handler) {
-                        global_handler = acpi_gbl_device_notify.handler;
-                        global_context = acpi_gbl_device_notify.context;
-                }
-        }
-        /* Invoke the system handler first, if present */
-        if (global_handler) {
+        if (info->notify.global->handler) {
-                global_handler(notify_info->notify.node,
+                info->notify.global->handler(info->notify.node,
-                               notify_info->notify.value, global_context);
+                                             info->notify.value,
+                                             info->notify.global->context);
        }
-        /* Now invoke the per-device handler, if present */
+        /* Now invoke the local notify handler(s) if any are installed */
-        handler_obj = notify_info->notify.handler_obj;
+        handler_obj = info->notify.handler_list_head;
-        if (handler_obj) {
+        while (handler_obj) {
-                struct acpi_object_notify_handler *notifier;
+                handler_obj->notify.handler(info->notify.node,
+                                            info->notify.value,
+                                            handler_obj->notify.context);
-                notifier = &handler_obj->notify;
+                handler_obj =
-                while (notifier) {
+                    handler_obj->notify.next[info->notify.handler_list_id];
-                        notifier->handler(notify_info->notify.node,
-                                          notify_info->notify.value,
-                                          notifier->context);
-                        notifier = notifier->next;
-                }
        }
        /* All done with the info object */
-        acpi_ut_delete_generic_state(notify_info);
+        acpi_ut_delete_generic_state(info);
 }
 #if (!ACPI_REDUCED_HARDWARE)
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 1b0180a1b798..0cc6a16fedc7 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -150,7 +150,7 @@ acpi_status acpi_ev_install_region_handlers(void)
 *
 * FUNCTION:    acpi_ev_has_default_handler
 *
- * PARAMETERS:  Node                - Namespace node for the device
+ * PARAMETERS:  node                - Namespace node for the device
 *              space_id            - The address space ID
 *
 * RETURN:      TRUE if default handler is installed, FALSE otherwise
@@ -244,7 +244,7 @@ acpi_status acpi_ev_initialize_op_regions(void)
 * FUNCTION:    acpi_ev_execute_reg_method
 *
 * PARAMETERS:  region_obj          - Region object
- *              Function            - Passed to _REG: On (1) or Off (0)
+ *              function            - Passed to _REG: On (1) or Off (0)
 *
 * RETURN:      Status
 *
@@ -286,10 +286,10 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
        /*
         * The _REG method has two arguments:
         *
-         * Arg0 - Integer:
+         * arg0 - Integer:
         *  Operation region space ID Same value as region_obj->Region.space_id
         *
-         * Arg1 - Integer:
+         * arg1 - Integer:
         *  connection status 1 for connecting the handler, 0 for disconnecting
         *  the handler (Passed as a parameter)
         */
@@ -330,10 +330,10 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 *
 * PARAMETERS:  region_obj          - Internal region object
 *              field_obj           - Corresponding field. Can be NULL.
- *              Function            - Read or Write operation
+ *              function            - Read or Write operation
 *              region_offset       - Where in the region to read or write
 *              bit_width           - Field width in bits (8, 16, 32, or 64)
- *              Value               - Pointer to in or out value, must be
+ *              value               - Pointer to in or out value, must be
 *                                    a full 64-bit integer
 *
 * RETURN:      Status
@@ -840,11 +840,11 @@ acpi_ev_install_handler(acpi_handle obj_handle,
 *
 * FUNCTION:    acpi_ev_install_space_handler
 *
- * PARAMETERS:  Node            - Namespace node for the device
+ * PARAMETERS:  node            - Namespace node for the device
 *              space_id        - The address space ID
- *              Handler         - Address of the handler
+ *              handler         - Address of the handler
- *              Setup           - Address of the setup function
+ *              setup           - Address of the setup function
- *              Context         - Value passed to the handler on each access
+ *              context         - Value passed to the handler on each access
 *
 * RETURN:      Status
 *
@@ -1061,7 +1061,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
 *
 * FUNCTION:    acpi_ev_execute_reg_methods
 *
- * PARAMETERS:  Node            - Namespace node for the device
+ * PARAMETERS:  node            - Namespace node for the device
 *              space_id        - The address space ID
 *
 * RETURN:      Status
@@ -1104,7 +1104,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
 *
 * PARAMETERS:  walk_namespace callback
 *
- * DESCRIPTION: Run _REG method for region objects of the requested space_iD
+ * DESCRIPTION: Run _REG method for region objects of the requested spaceID
 *
 ******************************************************************************/
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 819c17f5897a..4c1c8261166f 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -56,8 +56,8 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);
 *
 * FUNCTION:    acpi_ev_system_memory_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
@@ -118,8 +118,8 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
 *
 * FUNCTION:    acpi_ev_io_space_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
@@ -149,8 +149,8 @@ acpi_ev_io_space_region_setup(acpi_handle handle,
 *
 * FUNCTION:    acpi_ev_pci_config_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
@@ -338,7 +338,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 *
 * FUNCTION:    acpi_ev_is_pci_root_bridge
 *
- * PARAMETERS:  Node            - Device node being examined
+ * PARAMETERS:  node            - Device node being examined
 *
 * RETURN:      TRUE if device is a PCI/PCI-Express Root Bridge
 *
@@ -393,14 +393,14 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
 *
 * FUNCTION:    acpi_ev_pci_bar_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Setup a pci_bAR operation region
+ * DESCRIPTION: Setup a pci_BAR operation region
 *
 * MUTEX:       Assumes namespace is not locked
 *
@@ -420,8 +420,8 @@ acpi_ev_pci_bar_region_setup(acpi_handle handle,
 *
 * FUNCTION:    acpi_ev_cmos_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
@@ -447,8 +447,8 @@ acpi_ev_cmos_region_setup(acpi_handle handle,
 *
 * FUNCTION:    acpi_ev_default_region_setup
 *
- * PARAMETERS:  Handle              - Region we are interested in
+ * PARAMETERS:  handle              - Region we are interested in
- *              Function            - Start or stop
+ *              function            - Start or stop
 *              handler_context     - Address space handler context
 *              region_context      - Region specific context
 *
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 6a57aa2d70d1..f9661e2b46a9 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -56,7 +56,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context);
 *
 * FUNCTION:    acpi_ev_sci_xrupt_handler
 *
- * PARAMETERS:  Context   - Calling Context
+ * PARAMETERS:  context   - Calling Context
 *
 * RETURN:      Status code indicates whether interrupt was handled.
 *
@@ -96,7 +96,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
 *
 * FUNCTION:    acpi_ev_gpe_xrupt_handler
 *
- * PARAMETERS:  Context   - Calling Context
+ * PARAMETERS:  context   - Calling Context
 *
 * RETURN:      Status code indicates whether interrupt was handled.
 *
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 44bef5744ebb..7587eb6c9584 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -54,86 +54,25 @@ ACPI_MODULE_NAME("evxface")
 /*******************************************************************************
 *
- * FUNCTION:    acpi_populate_handler_object
- *
- * PARAMETERS:  handler_obj        - Handler object to populate
- *              handler_type       - The type of handler:
- *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
- *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
- *                                  ACPI_ALL_NOTIFY:  both system and device
- *              handler            - Address of the handler
- *              context            - Value passed to the handler on each GPE
- *              next               - Address of a handler object to link to
- *
- * RETURN:      None
- *
- * DESCRIPTION: Populate a handler object.
- *
- ******************************************************************************/
-static void
-acpi_populate_handler_object(struct acpi_object_notify_handler *handler_obj,
-                             u32 handler_type,
-                             acpi_notify_handler handler, void *context,
-                             struct acpi_object_notify_handler *next)
-{
-        handler_obj->handler_type = handler_type;
-        handler_obj->handler = handler;
-        handler_obj->context = context;
-        handler_obj->next = next;
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_add_handler_object
- *
- * PARAMETERS:  parent_obj         - Parent of the new object
- *              handler            - Address of the handler
- *              context            - Value passed to the handler on each GPE
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a new handler object and populate it.
- *
- ******************************************************************************/
-static acpi_status
-acpi_add_handler_object(struct acpi_object_notify_handler *parent_obj,
-                        acpi_notify_handler handler, void *context)
-{
-        struct acpi_object_notify_handler *handler_obj;
-        /* The parent must not be a defice notify handler object. */
-        if (parent_obj->handler_type & ACPI_DEVICE_NOTIFY)
-                return AE_BAD_PARAMETER;
-        handler_obj = ACPI_ALLOCATE_ZEROED(sizeof(*handler_obj));
-        if (!handler_obj)
-                return AE_NO_MEMORY;
-        acpi_populate_handler_object(handler_obj,
-                                        ACPI_SYSTEM_NOTIFY,
-                                        handler, context,
-                                        parent_obj->next);
-        parent_obj->next = handler_obj;
-        return AE_OK;
-}
-/*******************************************************************************
- *
 * FUNCTION:    acpi_install_notify_handler
 *
 * PARAMETERS:  Device          - The device for which notifies will be handled
 *              handler_type    - The type of handler:
- *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
+ *                                  ACPI_SYSTEM_NOTIFY: System Handler (00-7F)
- *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
+ *                                  ACPI_DEVICE_NOTIFY: Device Handler (80-FF)
- *                                  ACPI_ALL_NOTIFY:  both system and device
+ *                                  ACPI_ALL_NOTIFY:    Both System and Device
 *              Handler         - Address of the handler
 *              Context         - Value passed to the handler on each GPE
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Install a handler for notifies on an ACPI device
+ * DESCRIPTION: Install a handler for notifications on an ACPI Device,
+ *              thermal_zone, or Processor object.
+ *
+ * NOTES:       The Root namespace object may have only one handler for each
+ *              type of notify (System/Device). Device/Thermal/Processor objects
+ *              may have one device notify handler, and multiple system notify
+ *              handlers.
 *
 ******************************************************************************/
 acpi_status
@@ -141,17 +80,19 @@ acpi_install_notify_handler(acpi_handle device,
                            u32 handler_type,
                            acpi_notify_handler handler, void *context)
 {
+        struct acpi_namespace_node *node =
+            ACPI_CAST_PTR(struct acpi_namespace_node, device);
        union acpi_operand_object *obj_desc;
-        union acpi_operand_object *notify_obj;
+        union acpi_operand_object *handler_obj;
-        struct acpi_namespace_node *node;
        acpi_status status;
+        u32 i;
        ACPI_FUNCTION_TRACE(acpi_install_notify_handler);
        /* Parameter validation */
-        if ((!device) ||
+        if ((!device) || (!handler) || (!handler_type) ||
-            (!handler) || (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
+            (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
@@ -160,144 +101,112 @@ acpi_install_notify_handler(acpi_handle device,
                return_ACPI_STATUS(status);
        }
-        /* Convert and validate the device handle */
-        node = acpi_ns_validate_handle(device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
        /*
         * Root Object:
         * Registering a notify handler on the root object indicates that the
         * caller wishes to receive notifications for all objects. Note that
-         * only one <external> global handler can be regsitered (per notify type).
+         * only one global handler can be registered per notify type.
+         * Ensure that a handler is not already installed.
         */
        if (device == ACPI_ROOT_OBJECT) {
+                for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
+                        if (handler_type & (i + 1)) {
+                                if (acpi_gbl_global_notify[i].handler) {
+                                        status = AE_ALREADY_EXISTS;
+                                        goto unlock_and_exit;
+                                }
-                /* Make sure the handler is not already installed */
+                                acpi_gbl_global_notify[i].handler = handler;
+                                acpi_gbl_global_notify[i].context = context;
-                if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
+                        }
-                     acpi_gbl_system_notify.handler) ||
-                    ((handler_type & ACPI_DEVICE_NOTIFY) &&
-                     acpi_gbl_device_notify.handler)) {
-                        status = AE_ALREADY_EXISTS;
-                        goto unlock_and_exit;
-                }
-                if (handler_type & ACPI_SYSTEM_NOTIFY) {
-                        acpi_gbl_system_notify.node = node;
-                        acpi_gbl_system_notify.handler = handler;
-                        acpi_gbl_system_notify.context = context;
-                }
-                if (handler_type & ACPI_DEVICE_NOTIFY) {
-                        acpi_gbl_device_notify.node = node;
-                        acpi_gbl_device_notify.handler = handler;
-                        acpi_gbl_device_notify.context = context;
                }
-                /* Global notify handler installed */
+                goto unlock_and_exit;   /* Global notify handler installed, all done */
        }
        /*
         * All Other Objects:
-         * Caller will only receive notifications specific to the target object.
+         * Caller will only receive notifications specific to the target
-         * Note that only certain object types can receive notifications.
+         * object. Note that only certain object types are allowed to
+         * receive notifications.
         */
-        else {
-                /* Notifies allowed on this object? */
-                if (!acpi_ev_is_notify_object(node)) {
+        /* Are Notifies allowed on this object? */
-                        status = AE_TYPE;
-                        goto unlock_and_exit;
-                }
-                /* Check for an existing internal object */
+        if (!acpi_ev_is_notify_object(node)) {
+                status = AE_TYPE;
+                goto unlock_and_exit;
+        }
-                obj_desc = acpi_ns_get_attached_object(node);
+        /* Check for an existing internal object, might not exist */
-                if (obj_desc) {
-                        /* Object exists. */
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
-                        /* For a device notify, make sure there's no handler. */
+                /* Create a new object */
-                        if ((handler_type & ACPI_DEVICE_NOTIFY) &&
-                             obj_desc->common_notify.device_notify) {
-                                status = AE_ALREADY_EXISTS;
-                                goto unlock_and_exit;
-                        }
-                        /* System notifies may have more handlers installed. */
+                obj_desc = acpi_ut_create_internal_object(node->type);
-                        notify_obj = obj_desc->common_notify.system_notify;
+                if (!obj_desc) {
+                        status = AE_NO_MEMORY;
+                        goto unlock_and_exit;
+                }
-                        if ((handler_type & ACPI_SYSTEM_NOTIFY) && notify_obj) {
+                /* Attach new object to the Node, remove local reference */
-                                struct acpi_object_notify_handler *parent_obj;
+                status = acpi_ns_attach_object(device, obj_desc, node->type);
+                acpi_ut_remove_reference(obj_desc);
+                if (ACPI_FAILURE(status)) {
+                        goto unlock_and_exit;
+                }
+        }
-                                if (handler_type & ACPI_DEVICE_NOTIFY) {
+        /* Ensure that the handler is not already installed in the lists */
+        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
+                if (handler_type & (i + 1)) {
+                        handler_obj = obj_desc->common_notify.notify_list[i];
+                        while (handler_obj) {
+                                if (handler_obj->notify.handler == handler) {
                                        status = AE_ALREADY_EXISTS;
                                        goto unlock_and_exit;
                                }
-                                parent_obj = &notify_obj->notify;
+                                handler_obj = handler_obj->notify.next[i];
-                                status = acpi_add_handler_object(parent_obj,
-                                                                 handler,
-                                                                 context);
-                                goto unlock_and_exit;
-                        }
-                } else {
-                        /* Create a new object */
-                        obj_desc = acpi_ut_create_internal_object(node->type);
-                        if (!obj_desc) {
-                                status = AE_NO_MEMORY;
-                                goto unlock_and_exit;
-                        }
-                        /* Attach new object to the Node */
-                        status =
-                            acpi_ns_attach_object(device, obj_desc, node->type);
-                        /* Remove local reference to the object */
-                        acpi_ut_remove_reference(obj_desc);
-                        if (ACPI_FAILURE(status)) {
-                                goto unlock_and_exit;
                        }
                }
+        }
-                /* Install the handler */
+        /* Create and populate a new notify handler object */
-                notify_obj =
+        handler_obj = acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_NOTIFY);
-                    acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_NOTIFY);
+        if (!handler_obj) {
-                if (!notify_obj) {
+                status = AE_NO_MEMORY;
-                        status = AE_NO_MEMORY;
+                goto unlock_and_exit;
-                        goto unlock_and_exit;
+        }
-                }
-                acpi_populate_handler_object(&notify_obj->notify,
+        handler_obj->notify.node = node;
-                                                handler_type,
+        handler_obj->notify.handler_type = handler_type;
-                                                handler, context,
+        handler_obj->notify.handler = handler;
-                                                NULL);
+        handler_obj->notify.context = context;
-                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+        /* Install the handler at the list head(s) */
-                        obj_desc->common_notify.system_notify = notify_obj;
-                }
-                if (handler_type & ACPI_DEVICE_NOTIFY) {
+        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                        obj_desc->common_notify.device_notify = notify_obj;
+                if (handler_type & (i + 1)) {
-                }
+                        handler_obj->notify.next[i] =
+                            obj_desc->common_notify.notify_list[i];
-                if (handler_type == ACPI_ALL_NOTIFY) {
+                        obj_desc->common_notify.notify_list[i] = handler_obj;
+                }
+        }
-                        /* Extra ref if installed in both */
+        /* Add an extra reference if handler was installed in both lists */
-                        acpi_ut_add_reference(notify_obj);
+        if (handler_type == ACPI_ALL_NOTIFY) {
-                }
+                acpi_ut_add_reference(handler_obj);
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(status);
 }
@@ -308,11 +217,11 @@ ACPI_EXPORT_SYMBOL(acpi_install_notify_handler)
 *
 * FUNCTION:    acpi_remove_notify_handler
 *
- * PARAMETERS:  Device          - The device for which notifies will be handled
+ * PARAMETERS:  Device          - The device for which the handler is installed
 *              handler_type    - The type of handler:
- *                                  ACPI_SYSTEM_NOTIFY: system_handler (00-7f)
+ *                                  ACPI_SYSTEM_NOTIFY: System Handler (00-7F)
- *                                  ACPI_DEVICE_NOTIFY: driver_handler (80-ff)
+ *                                  ACPI_DEVICE_NOTIFY: Device Handler (80-FF)
- *                                  ACPI_ALL_NOTIFY:  both system and device
+ *                                  ACPI_ALL_NOTIFY:    Both System and Device
 *              Handler         - Address of the handler
 *
 * RETURN:      Status
@@ -324,165 +233,106 @@ acpi_status
 acpi_remove_notify_handler(acpi_handle device,
                           u32 handler_type, acpi_notify_handler handler)
 {
-        union acpi_operand_object *notify_obj;
+        struct acpi_namespace_node *node =
+            ACPI_CAST_PTR(struct acpi_namespace_node, device);
        union acpi_operand_object *obj_desc;
-        struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_obj;
+        union acpi_operand_object *previous_handler_obj;
        acpi_status status;
+        u32 i;
        ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
        /* Parameter validation */
-        if ((!device) ||
+        if ((!device) || (!handler) || (!handler_type) ||
-            (!handler) || (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
+            (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
-                status = AE_BAD_PARAMETER;
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
-                goto exit;
        }
        /* Make sure all deferred tasks are completed */
-        acpi_os_wait_events_complete(NULL);
+        acpi_os_wait_events_complete();
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
-                goto exit;
+                return_ACPI_STATUS(status);
-        }
-        /* Convert and validate the device handle */
-        node = acpi_ns_validate_handle(device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
        }
-        /* Root Object */
+        /* Root Object. Global handlers are removed here */
        if (device == ACPI_ROOT_OBJECT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                                  "Removing notify handler for namespace root object\n"));
+                        if (handler_type & (i + 1)) {
+                                if (!acpi_gbl_global_notify[i].handler ||
+                                    (acpi_gbl_global_notify[i].handler !=
+                                     handler)) {
+                                        status = AE_NOT_EXIST;
+                                        goto unlock_and_exit;
+                                }
-                if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
+                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                     !acpi_gbl_system_notify.handler) ||
+                                                  "Removing global notify handler\n"));
-                    ((handler_type & ACPI_DEVICE_NOTIFY) &&
-                     !acpi_gbl_device_notify.handler)) {
-                        status = AE_NOT_EXIST;
-                        goto unlock_and_exit;
-                }
-                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                                acpi_gbl_global_notify[i].handler = NULL;
-                        acpi_gbl_system_notify.node = NULL;
+                                acpi_gbl_global_notify[i].context = NULL;
-                        acpi_gbl_system_notify.handler = NULL;
+                        }
-                        acpi_gbl_system_notify.context = NULL;
                }
-                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                goto unlock_and_exit;
-                        acpi_gbl_device_notify.node = NULL;
-                        acpi_gbl_device_notify.handler = NULL;
-                        acpi_gbl_device_notify.context = NULL;
-                }
        }
-        /* All Other Objects */
+        /* All other objects: Are Notifies allowed on this object? */
-        else {
+        if (!acpi_ev_is_notify_object(node)) {
-                /* Notifies allowed on this object? */
+                status = AE_TYPE;
+                goto unlock_and_exit;
+        }
-                if (!acpi_ev_is_notify_object(node)) {
+        /* Must have an existing internal object */
-                        status = AE_TYPE;
-                        goto unlock_and_exit;
-                }
-                /* Check for an existing internal object */
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
+                status = AE_NOT_EXIST;
+                goto unlock_and_exit;
+        }
-                obj_desc = acpi_ns_get_attached_object(node);
+        /* Internal object exists. Find the handler and remove it */
-                if (!obj_desc) {
-                        status = AE_NOT_EXIST;
-                        goto unlock_and_exit;
-                }
-                /* Object exists - make sure there's an existing handler */
+        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
+                if (handler_type & (i + 1)) {
+                        handler_obj = obj_desc->common_notify.notify_list[i];
+                        previous_handler_obj = NULL;
-                if (handler_type & ACPI_SYSTEM_NOTIFY) {
+                        /* Attempt to find the handler in the handler list */
-                        struct acpi_object_notify_handler *handler_obj;
-                        struct acpi_object_notify_handler *parent_obj;
-                        notify_obj = obj_desc->common_notify.system_notify;
+                        while (handler_obj &&
-                        if (!notify_obj) {
+                               (handler_obj->notify.handler != handler)) {
-                                status = AE_NOT_EXIST;
+                                previous_handler_obj = handler_obj;
-                                goto unlock_and_exit;
+                                handler_obj = handler_obj->notify.next[i];
-                        }
-                        handler_obj = &notify_obj->notify;
-                        parent_obj = NULL;
-                        while (handler_obj->handler != handler) {
-                                if (handler_obj->next) {
-                                        parent_obj = handler_obj;
-                                        handler_obj = handler_obj->next;
-                                } else {
-                                        break;
-                                }
                        }
-                        if (handler_obj->handler != handler) {
+                        if (!handler_obj) {
-                                status = AE_BAD_PARAMETER;
+                                status = AE_NOT_EXIST;
                                goto unlock_and_exit;
                        }
-                        /*
+                        /* Remove the handler object from the list */
-                         * Remove the handler.  There are three possible cases.
-                         * First, we may need to remove a non-embedded object.
-                         * Second, we may need to remove the embedded object's
-                         * handler data, while non-embedded objects exist.
-                         * Finally, we may need to remove the embedded object
-                         * entirely along with its container.
-                         */
-                        if (parent_obj) {
-                                /* Non-embedded object is being removed. */
-                                parent_obj->next = handler_obj->next;
-                                ACPI_FREE(handler_obj);
-                        } else if (notify_obj->notify.next) {
-                                /*
-                                 * The handler matches the embedded object, but
-                                 * there are more handler objects in the list.
-                                 * Replace the embedded object's data with the
-                                 * first next object's data and remove that
-                                 * object.
-                                 */
-                                parent_obj = &notify_obj->notify;
-                                handler_obj = notify_obj->notify.next;
-                                *parent_obj = *handler_obj;
-                                ACPI_FREE(handler_obj);
-                        } else {
-                                /* No more handler objects in the list. */
-                                obj_desc->common_notify.system_notify = NULL;
-                                acpi_ut_remove_reference(notify_obj);
-                        }
-                }
-                if (handler_type & ACPI_DEVICE_NOTIFY) {
+                        if (previous_handler_obj) {     /* Handler is not at the list head */
-                        notify_obj = obj_desc->common_notify.device_notify;
+                                previous_handler_obj->notify.next[i] =
-                        if (!notify_obj) {
+                                    handler_obj->notify.next[i];
-                                status = AE_NOT_EXIST;
+                        } else {        /* Handler is at the list head */
-                                goto unlock_and_exit;
-                        }
-                        if (notify_obj->notify.handler != handler) {
+                                obj_desc->common_notify.notify_list[i] =
-                                status = AE_BAD_PARAMETER;
+                                    handler_obj->notify.next[i];
-                                goto unlock_and_exit;
                        }
-                        /* Remove the handler */
+                        acpi_ut_remove_reference(handler_obj);
-                        obj_desc->common_notify.device_notify = NULL;
-                        acpi_ut_remove_reference(notify_obj);
                }
        }
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-      exit:
-        if (ACPI_FAILURE(status))
-                ACPI_EXCEPTION((AE_INFO, status, "Removing notify handler"));
        return_ACPI_STATUS(status);
 }
@@ -492,7 +342,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
 *
 * FUNCTION:    acpi_install_exception_handler
 *
- * PARAMETERS:  Handler         - Pointer to the handler function for the
+ * PARAMETERS:  handler         - Pointer to the handler function for the
 *                                event
 *
 * RETURN:      Status
@@ -536,8 +386,8 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 *
 * FUNCTION:    acpi_install_global_event_handler
 *
- * PARAMETERS:  Handler         - Pointer to the global event handler function
+ * PARAMETERS:  handler         - Pointer to the global event handler function
- *              Context         - Value passed to the handler on each event
+ *              context         - Value passed to the handler on each event
 *
 * RETURN:      Status
 *
@@ -586,10 +436,10 @@ ACPI_EXPORT_SYMBOL(acpi_install_global_event_handler)
 *
 * FUNCTION:    acpi_install_fixed_event_handler
 *
- * PARAMETERS:  Event           - Event type to enable.
+ * PARAMETERS:  event           - Event type to enable.
- *              Handler         - Pointer to the handler function for the
+ *              handler         - Pointer to the handler function for the
 *                                event
- *              Context         - Value passed to the handler on each GPE
+ *              context         - Value passed to the handler on each GPE
 *
 * RETURN:      Status
 *
@@ -656,8 +506,8 @@ ACPI_EXPORT_SYMBOL(acpi_install_fixed_event_handler)
 *
 * FUNCTION:    acpi_remove_fixed_event_handler
 *
- * PARAMETERS:  Event           - Event type to disable.
+ * PARAMETERS:  event           - Event type to disable.
- *              Handler         - Address of the handler
+ *              handler         - Address of the handler
 *
 * RETURN:      Status
 *
@@ -713,10 +563,10 @@ ACPI_EXPORT_SYMBOL(acpi_remove_fixed_event_handler)
 * PARAMETERS:  gpe_device      - Namespace node for the GPE (NULL for FADT
 *                                defined GPEs)
 *              gpe_number      - The GPE number within the GPE block
- *              Type            - Whether this GPE should be treated as an
+ *              type            - Whether this GPE should be treated as an
 *                                edge- or level-triggered interrupt.
- *              Address         - Address of the handler
+ *              address         - Address of the handler
- *              Context         - Value passed to the handler on each GPE
+ *              context         - Value passed to the handler on each GPE
 *
 * RETURN:      Status
 *
@@ -823,7 +673,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)
 * PARAMETERS:  gpe_device      - Namespace node for the GPE (NULL for FADT
 *                                defined GPEs)
 *              gpe_number      - The event to remove a handler
- *              Address         - Address of the handler
+ *              address         - Address of the handler
 *
 * RETURN:      Status
 *
@@ -849,7 +699,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
        /* Make sure all deferred tasks are completed */
-        acpi_os_wait_events_complete(NULL);
+        acpi_os_wait_events_complete();
        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
        if (ACPI_FAILURE(status)) {
@@ -919,8 +769,8 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_handler)
 *
 * FUNCTION:    acpi_acquire_global_lock
 *
- * PARAMETERS:  Timeout         - How long the caller is willing to wait
+ * PARAMETERS:  timeout         - How long the caller is willing to wait
- *              Handle          - Where the handle to the lock is returned
+ *              handle          - Where the handle to the lock is returned
 *                                (if acquired)
 *
 * RETURN:      Status
@@ -967,7 +817,7 @@ ACPI_EXPORT_SYMBOL(acpi_acquire_global_lock)
 *
 * FUNCTION:    acpi_release_global_lock
 *
- * PARAMETERS:  Handle      - Returned from acpi_acquire_global_lock
+ * PARAMETERS:  handle      - Returned from acpi_acquire_global_lock
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 77cee5a5e891..35520c6eeefb 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -153,8 +153,8 @@ ACPI_EXPORT_SYMBOL(acpi_disable)
 *
 * FUNCTION:    acpi_enable_event
 *
- * PARAMETERS:  Event           - The fixed eventto be enabled
+ * PARAMETERS:  event           - The fixed eventto be enabled
- *              Flags           - Reserved
+ *              flags           - Reserved
 *
 * RETURN:      Status
 *
@@ -265,7 +265,7 @@ ACPI_EXPORT_SYMBOL(acpi_disable_event)
 *
 * FUNCTION:    acpi_clear_event
 *
- * PARAMETERS:  Event           - The fixed event to be cleared
+ * PARAMETERS:  event           - The fixed event to be cleared
 *
 * RETURN:      Status
 *
@@ -301,7 +301,7 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
 *
 * FUNCTION:    acpi_get_event_status
 *
- * PARAMETERS:  Event           - The fixed event
+ * PARAMETERS:  event           - The fixed event
 *              event_status    - Where the current status of the event will
 *                                be returned
 *
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 86f9b343ebd4..6affbdb4b88c 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -197,12 +197,12 @@ acpi_status
 acpi_setup_gpe_for_wake(acpi_handle wake_device,
                        acpi_handle gpe_device, u32 gpe_number)
 {
-        acpi_status status = AE_BAD_PARAMETER;
+        acpi_status status;
        struct acpi_gpe_event_info *gpe_event_info;
        struct acpi_namespace_node *device_node;
-        struct acpi_gpe_notify_object *notify_object;
+        struct acpi_gpe_notify_info *notify;
+        struct acpi_gpe_notify_info *new_notify;
        acpi_cpu_flags flags;
-        u8 gpe_dispatch_mask;
        ACPI_FUNCTION_TRACE(acpi_setup_gpe_for_wake);
@@ -216,63 +216,95 @@ acpi_setup_gpe_for_wake(acpi_handle wake_device,
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
+        /* Handle root object case */
+        if (wake_device == ACPI_ROOT_OBJECT) {
+                device_node = acpi_gbl_root_node;
+        } else {
+                device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
+        }
+        /* Validate WakeDevice is of type Device */
+        if (device_node->type != ACPI_TYPE_DEVICE) {
+                return_ACPI_STATUS (AE_BAD_PARAMETER);
+        }
+        /*
+         * Allocate a new notify object up front, in case it is needed.
+         * Memory allocation while holding a spinlock is a big no-no
+         * on some hosts.
+         */
+        new_notify = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_notify_info));
+        if (!new_notify) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
        /* Ensure that we have a valid GPE number */
        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
+                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
-        if (wake_device == ACPI_ROOT_OBJECT) {
-                goto out;
-        }
        /*
         * If there is no method or handler for this GPE, then the
-         * wake_device will be notified whenever this GPE fires (aka
+         * wake_device will be notified whenever this GPE fires. This is
-         * "implicit notify") Note: The GPE is assumed to be
+         * known as an "implicit notify". Note: The GPE is assumed to be
         * level-triggered (for windows compatibility).
         */
-        gpe_dispatch_mask = gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK;
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-        if (gpe_dispatch_mask != ACPI_GPE_DISPATCH_NONE
+            ACPI_GPE_DISPATCH_NONE) {
-            && gpe_dispatch_mask != ACPI_GPE_DISPATCH_NOTIFY) {
+                /*
-                goto out;
+                 * This is the first device for implicit notify on this GPE.
-        }
+                 * Just set the flags here, and enter the NOTIFY block below.
+                 */
-        /* Validate wake_device is of type Device */
+                gpe_event_info->flags =
+                    (ACPI_GPE_DISPATCH_NOTIFY | ACPI_GPE_LEVEL_TRIGGERED);
-        device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
-        if (device_node->type != ACPI_TYPE_DEVICE) {
-                goto unlock_and_exit;
        }
-        if (gpe_dispatch_mask == ACPI_GPE_DISPATCH_NONE) {
+        /*
-                gpe_event_info->flags = (ACPI_GPE_DISPATCH_NOTIFY |
+         * If we already have an implicit notify on this GPE, add
-                                         ACPI_GPE_LEVEL_TRIGGERED);
+         * this device to the notify list.
-                gpe_event_info->dispatch.device.node = device_node;
+         */
-                gpe_event_info->dispatch.device.next = NULL;
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
-        } else {
+            ACPI_GPE_DISPATCH_NOTIFY) {
-                /* There are multiple devices to notify implicitly. */
+                /* Ensure that the device is not already in the list */
-                notify_object = ACPI_ALLOCATE_ZEROED(sizeof(*notify_object));
-                if (!notify_object) {
+                notify = gpe_event_info->dispatch.notify_list;
-                        status = AE_NO_MEMORY;
+                while (notify) {
-                        goto unlock_and_exit;
+                        if (notify->device_node == device_node) {
+                                status = AE_ALREADY_EXISTS;
+                                goto unlock_and_exit;
+                        }
+                        notify = notify->next;
                }
-                notify_object->node = device_node;
+                /* Add this device to the notify list for this GPE */
-                notify_object->next = gpe_event_info->dispatch.device.next;
-                gpe_event_info->dispatch.device.next = notify_object;
+                new_notify->device_node = device_node;
+                new_notify->next = gpe_event_info->dispatch.notify_list;
+                gpe_event_info->dispatch.notify_list = new_notify;
+                new_notify = NULL;
        }
- out:
+        /* Mark the GPE as a possible wake event */
        gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
        status = AE_OK;
- unlock_and_exit:
+unlock_and_exit:
        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        /* Delete the notify object if it was not used above */
+        if (new_notify) {
+                ACPI_FREE(new_notify);
+        }
        return_ACPI_STATUS(status);
 }
 ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
@@ -283,7 +315,7 @@ ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
 *
 * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
 *              gpe_number      - GPE level within the GPE block
- *              Action          - Enable or Disable
+ *              action              - Enable or Disable
 *
 * RETURN:      Status
 *
@@ -508,7 +540,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_all_runtime_gpes)
 * FUNCTION:    acpi_install_gpe_block
 *
 * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *              gpe_block_address   - Address and space_iD
+ *              gpe_block_address   - Address and space_ID
 *              register_count      - Number of GPE register pairs in the block
 *              interrupt_number    - H/W interrupt for the block
 *
@@ -653,7 +685,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
 *
 * FUNCTION:    acpi_get_gpe_device
 *
- * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
+ * PARAMETERS:  index               - System GPE index (0-current_gpe_count)
 *              gpe_device          - Where the parent GPE Device is returned
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 6019208cd4b6..96b412d03950 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -55,11 +55,11 @@ ACPI_MODULE_NAME("evxfregn")
 *
 * FUNCTION:    acpi_install_address_space_handler
 *
- * PARAMETERS:  Device          - Handle for the device
+ * PARAMETERS:  device          - Handle for the device
 *              space_id        - The address space ID
- *              Handler         - Address of the handler
+ *              handler         - Address of the handler
- *              Setup           - Address of the setup function
+ *              setup           - Address of the setup function
- *              Context         - Value passed to the handler on each access
+ *              context         - Value passed to the handler on each access
 *
 * RETURN:      Status
 *
@@ -112,16 +112,16 @@ acpi_install_address_space_handler(acpi_handle device,
        }
        /*
-         * For the default space_iDs, (the IDs for which there are default region handlers
+         * For the default space_IDs, (the IDs for which there are default region handlers
         * installed) Only execute the _REG methods if the global initialization _REG
         * methods have already been run (via acpi_initialize_objects). In other words,
-         * we will defer the execution of the _REG methods for these space_iDs until
+         * we will defer the execution of the _REG methods for these space_IDs until
         * execution of acpi_initialize_objects. This is done because we need the handlers
         * for the default spaces (mem/io/pci/table) to be installed before we can run
         * any control methods (or _REG methods). There is known BIOS code that depends
         * on this.
         *
-         * For all other space_iDs, we can safely execute the _REG methods immediately.
+         * For all other space_IDs, we can safely execute the _REG methods immediately.
         * This means that for IDs like embedded_controller, this function should be called
         * only after acpi_enable_subsystem has been called.
         */
@@ -157,9 +157,9 @@ ACPI_EXPORT_SYMBOL(acpi_install_address_space_handler)
 *
 * FUNCTION:    acpi_remove_address_space_handler
 *
- * PARAMETERS:  Device          - Handle for the device
+ * PARAMETERS:  device          - Handle for the device
 *              space_id        - The address space ID
- *              Handler         - Address of the handler
+ *              handler         - Address of the handler
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index c86d44e41bc8..16219bde48da 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -66,7 +66,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_add_table
 *
- * PARAMETERS:  Table               - Pointer to raw table
+ * PARAMETERS:  table               - Pointer to raw table
 *              parent_node         - Where to load the table (scope)
 *              ddb_handle          - Where to return the table handle.
 *
@@ -276,8 +276,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ex_region_read
 *
 * PARAMETERS:  obj_desc        - Region descriptor
- *              Length          - Number of bytes to read
+ *              length          - Number of bytes to read
- *              Buffer          - Pointer to where to put the data
+ *              buffer          - Pointer to where to put the data
 *
 * RETURN:      Status
 *
@@ -318,7 +318,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
 *
 * PARAMETERS:  obj_desc        - Region or Buffer/Field where the table will be
 *                                obtained
- *              Target          - Where a handle to the table will be stored
+ *              target          - Where a handle to the table will be stored
 *              walk_state      - Current state
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index e385436bd424..bfb062e4c4b4 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -60,7 +60,7 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 max_length);
 * PARAMETERS:  obj_desc        - Object to be converted. Must be an
 *                                Integer, Buffer, or String
 *              result_desc     - Where the new Integer object is returned
- *              Flags           - Used for string conversion
+ *              flags           - Used for string conversion
 *
 * RETURN:      Status
 *
@@ -272,9 +272,9 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_convert_to_ascii
 *
- * PARAMETERS:  Integer         - Value to be converted
+ * PARAMETERS:  integer         - Value to be converted
- *              Base            - ACPI_STRING_DECIMAL or ACPI_STRING_HEX
+ *              base            - ACPI_STRING_DECIMAL or ACPI_STRING_HEX
- *              String          - Where the string is returned
+ *              string          - Where the string is returned
 *              data_width      - Size of data item to be converted, in bytes
 *
 * RETURN:      Actual string length
@@ -385,7 +385,7 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
 * PARAMETERS:  obj_desc        - Object to be converted. Must be an
 *                                Integer, Buffer, or String
 *              result_desc     - Where the string object is returned
- *              Type            - String flags (base and conversion type)
+ *              type            - String flags (base and conversion type)
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 3f5bc998c1cb..691d4763102c 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -369,7 +369,7 @@ acpi_ex_create_region(u8 * aml_start,
 *
 * DESCRIPTION: Create a new processor object and populate the fields
 *
- *              Processor (Name[0], cpu_iD[1], pblock_addr[2], pblock_length[3])
+ *              Processor (Name[0], cpu_ID[1], pblock_addr[2], pblock_length[3])
 *
 ******************************************************************************/
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index e211e9c19215..bc5b9a6a1316 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -54,8 +54,8 @@ ACPI_MODULE_NAME("exdebug")
 * FUNCTION:    acpi_ex_do_debug_object
 *
 * PARAMETERS:  source_desc         - Object to be output to "Debug Object"
- *              Level               - Indentation level (used for packages)
+ *              level               - Indentation level (used for packages)
- *              Index               - Current package element, zero if not pkg
+ *              index               - Current package element, zero if not pkg
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 2a6ac0a3bc1e..213c081776fc 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -109,9 +109,9 @@ static struct acpi_exdump_info acpi_ex_dump_package[5] = {
 static struct acpi_exdump_info acpi_ex_dump_device[4] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_device), NULL},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.handler), "Handler"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.system_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.notify_list[0]),
         "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.device_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.notify_list[1]),
         "Device Notify"}
 };
@@ -158,9 +158,9 @@ static struct acpi_exdump_info acpi_ex_dump_power[5] = {
         "System Level"},
        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(power_resource.resource_order),
         "Resource Order"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.system_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.notify_list[0]),
         "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.device_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.notify_list[1]),
         "Device Notify"}
 };
@@ -169,18 +169,18 @@ static struct acpi_exdump_info acpi_ex_dump_processor[7] = {
        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},
        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.length), "Length"},
        {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.notify_list[0]),
         "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.device_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.notify_list[1]),
         "Device Notify"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.handler), "Handler"}
 };
 static struct acpi_exdump_info acpi_ex_dump_thermal[4] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_thermal), NULL},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.system_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.notify_list[0]),
         "System Notify"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.device_notify),
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.notify_list[1]),
         "Device Notify"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.handler), "Handler"}
 };
@@ -241,10 +241,15 @@ static struct acpi_exdump_info acpi_ex_dump_address_handler[6] = {
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.context), "Context"}
 };
-static struct acpi_exdump_info acpi_ex_dump_notify[3] = {
+static struct acpi_exdump_info acpi_ex_dump_notify[7] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_notify), NULL},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.node), "Node"},
-        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.context), "Context"}
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(notify.handler_type), "Handler Type"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.handler), "Handler"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.context), "Context"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.next[0]),
+         "Next System Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.next[1]), "Next Device Notify"}
 };
 /* Miscellaneous tables */
@@ -318,7 +323,7 @@ static struct acpi_exdump_info *acpi_ex_dump_info[] = {
 * FUNCTION:    acpi_ex_dump_object
 *
 * PARAMETERS:  obj_desc            - Descriptor to dump
- *              Info                - Info table corresponding to this object
+ *              info                - Info table corresponding to this object
 *                                    type
 *
 * RETURN:      None
@@ -444,7 +449,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_dump_operand
 *
 * PARAMETERS:  *obj_desc       - Pointer to entry to be dumped
- *              Depth           - Current nesting depth
+ *              depth           - Current nesting depth
 *
 * RETURN:      None
 *
@@ -726,7 +731,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 *
 * FUNCTION:    acpi_ex_dump_operands
 *
- * PARAMETERS:  Operands            - A list of Operand objects
+ * PARAMETERS:  operands            - A list of Operand objects
 *              opcode_name         - AML opcode name
 *              num_operands        - Operand count for this opcode
 *
@@ -769,8 +774,8 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
 *
 * FUNCTION:    acpi_ex_out* functions
 *
- * PARAMETERS:  Title               - Descriptive text
+ * PARAMETERS:  title               - Descriptive text
- *              Value               - Value to be displayed
+ *              value               - Value to be displayed
 *
 * DESCRIPTION: Object dump output formatting functions.  These functions
 *              reduce the number of format strings required and keeps them
@@ -792,8 +797,8 @@ static void acpi_ex_out_pointer(char *title, void *value)
 *
 * FUNCTION:    acpi_ex_dump_namespace_node
 *
- * PARAMETERS:  Node                - Descriptor to dump
+ * PARAMETERS:  node                - Descriptor to dump
- *              Flags               - Force display if TRUE
+ *              flags               - Force display if TRUE
 *
 * DESCRIPTION: Dumps the members of the given.Node
 *
@@ -825,7 +830,7 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
 *
 * FUNCTION:    acpi_ex_dump_reference_obj
 *
- * PARAMETERS:  Object              - Descriptor to dump
+ * PARAMETERS:  object              - Descriptor to dump
 *
 * DESCRIPTION: Dumps a reference object
 *
@@ -882,8 +887,8 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
 * FUNCTION:    acpi_ex_dump_package_obj
 *
 * PARAMETERS:  obj_desc            - Descriptor to dump
- *              Level               - Indentation Level
+ *              level               - Indentation Level
- *              Index               - Package index for this object
+ *              index               - Package index for this object
 *
 * DESCRIPTION: Dumps the elements of the package
 *
@@ -926,9 +931,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
        case ACPI_TYPE_STRING:
                acpi_os_printf("[String] Value: ");
-                for (i = 0; i < obj_desc->string.length; i++) {
+                acpi_ut_print_string(obj_desc->string.pointer, ACPI_UINT8_MAX);
-                        acpi_os_printf("%c", obj_desc->string.pointer[i]);
-                }
                acpi_os_printf("\n");
                break;
@@ -977,7 +980,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_dump_object_descriptor
 *
 * PARAMETERS:  obj_desc            - Descriptor to dump
- *              Flags               - Force display if TRUE
+ *              flags               - Force display if TRUE
 *
 * DESCRIPTION: Dumps the members of the object descriptor given.
 *
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 149de45fdadd..a7784152ed30 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -222,9 +222,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 * PARAMETERS:  obj_desc                - Field to be read
 *              field_datum_byte_offset - Byte offset of this datum within the
 *                                        parent field
- *              Value                   - Where to store value (must at least
+ *              value                   - Where to store value (must at least
 *                                        64 bits)
- *              Function                - Read or Write flag plus other region-
+ *              function                - Read or Write flag plus other region-
 *                                        dependent flags
 *
 * RETURN:      Status
@@ -315,7 +315,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_register_overflow
 *
 * PARAMETERS:  obj_desc                - Register(Field) to be written
- *              Value                   - Value to be stored
+ *              value                   - Value to be stored
 *
 * RETURN:      TRUE if value overflows the field, FALSE otherwise
 *
@@ -365,7 +365,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 * PARAMETERS:  obj_desc                - Field to be read
 *              field_datum_byte_offset - Byte offset of this datum within the
 *                                        parent field
- *              Value                   - Where to store value (must be 64 bits)
+ *              value                   - Where to store value (must be 64 bits)
 *              read_write              - Read or Write flag
 *
 * RETURN:      Status
@@ -574,7 +574,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_write_with_update_rule
 *
 * PARAMETERS:  obj_desc                - Field to be written
- *              Mask                    - bitmask within field datum
+ *              mask                    - bitmask within field datum
 *              field_value             - Value to write
 *              field_datum_byte_offset - Offset of datum within field
 *
@@ -678,7 +678,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_extract_from_field
 *
 * PARAMETERS:  obj_desc            - Field to be read
- *              Buffer              - Where to store the field data
+ *              buffer              - Where to store the field data
 *              buffer_length       - Length of Buffer
 *
 * RETURN:      Status
@@ -823,7 +823,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 * FUNCTION:    acpi_ex_insert_into_field
 *
 * PARAMETERS:  obj_desc            - Field to be written
- *              Buffer              - Data to be written
+ *              buffer              - Data to be written
 *              buffer_length       - Length of Buffer
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 0a0893310348..271c0c57ea10 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -144,8 +144,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_concat_template
 *
- * PARAMETERS:  Operand0            - First source object
+ * PARAMETERS:  operand0            - First source object
- *              Operand1            - Second source object
+ *              operand1            - Second source object
 *              actual_return_desc  - Where to place the return object
 *              walk_state          - Current walk state
 *
@@ -229,8 +229,8 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
 *
 * FUNCTION:    acpi_ex_do_concatenate
 *
- * PARAMETERS:  Operand0            - First source object
+ * PARAMETERS:  operand0            - First source object
- *              Operand1            - Second source object
+ *              operand1            - Second source object
 *              actual_return_desc  - Where to place the return object
 *              walk_state          - Current walk state
 *
@@ -397,9 +397,9 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 *
 * FUNCTION:    acpi_ex_do_math_op
 *
- * PARAMETERS:  Opcode              - AML opcode
+ * PARAMETERS:  opcode              - AML opcode
- *              Integer0            - Integer operand #0
+ *              integer0            - Integer operand #0
- *              Integer1            - Integer operand #1
+ *              integer1            - Integer operand #1
 *
 * RETURN:      Integer result of the operation
 *
@@ -479,9 +479,9 @@ u64 acpi_ex_do_math_op(u16 opcode, u64 integer0, u64 integer1)
 *
 * FUNCTION:    acpi_ex_do_logical_numeric_op
 *
- * PARAMETERS:  Opcode              - AML opcode
+ * PARAMETERS:  opcode              - AML opcode
- *              Integer0            - Integer operand #0
+ *              integer0            - Integer operand #0
- *              Integer1            - Integer operand #1
+ *              integer1            - Integer operand #1
 *              logical_result      - TRUE/FALSE result of the operation
 *
 * RETURN:      Status
@@ -534,9 +534,9 @@ acpi_ex_do_logical_numeric_op(u16 opcode,
 *
 * FUNCTION:    acpi_ex_do_logical_op
 *
- * PARAMETERS:  Opcode              - AML opcode
+ * PARAMETERS:  opcode              - AML opcode
- *              Operand0            - operand #0
+ *              operand0            - operand #0
- *              Operand1            - operand #1
+ *              operand1            - operand #1
 *              logical_result      - TRUE/FALSE result of the operation
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 60933e9dc3c0..bcceda5be9e3 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -102,7 +102,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
 * FUNCTION:    acpi_ex_link_mutex
 *
 * PARAMETERS:  obj_desc            - The mutex to be linked
- *              Thread              - Current executing thread object
+ *              thread              - Current executing thread object
 *
 * RETURN:      None
 *
@@ -138,7 +138,7 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_acquire_mutex_object
 *
- * PARAMETERS:  Timeout             - Timeout in milliseconds
+ * PARAMETERS:  timeout             - Timeout in milliseconds
 *              obj_desc            - Mutex object
 *              thread_id           - Current thread state
 *
@@ -443,7 +443,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_release_all_mutexes
 *
- * PARAMETERS:  Thread              - Current executing thread object
+ * PARAMETERS:  thread              - Current executing thread object
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 30157f5a12d7..81eca60d2748 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -391,12 +391,12 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
 *
 * FUNCTION:    acpi_ex_prep_field_value
 *
- * PARAMETERS:  Info    - Contains all field creation info
+ * PARAMETERS:  info    - Contains all field creation info
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
+ * DESCRIPTION: Construct an object of type union acpi_operand_object with a
- *              connect it to the parent Node.
+ *              subtype of def_field and connect it to the parent Node.
 *
 ******************************************************************************/
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 12d51df6d3bf..1f1ce0c3d2f8 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -53,10 +53,10 @@ ACPI_MODULE_NAME("exregion")
 *
 * FUNCTION:    acpi_ex_system_memory_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
@@ -270,10 +270,10 @@ acpi_ex_system_memory_space_handler(u32 function,
 *
 * FUNCTION:    acpi_ex_system_io_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
@@ -329,10 +329,10 @@ acpi_ex_system_io_space_handler(u32 function,
 *
 * FUNCTION:    acpi_ex_pci_config_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
@@ -365,7 +365,7 @@ acpi_ex_pci_config_space_handler(u32 function,
         *  pci_function is the PCI device function number
         *  pci_register is the Config space register range 0-255 bytes
         *
-         *  Value - input value for write, output address for read
+         *  value - input value for write, output address for read
         *
         */
        pci_id = (struct acpi_pci_id *)region_context;
@@ -402,10 +402,10 @@ acpi_ex_pci_config_space_handler(u32 function,
 *
 * FUNCTION:    acpi_ex_cmos_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
@@ -434,10 +434,10 @@ acpi_ex_cmos_space_handler(u32 function,
 *
 * FUNCTION:    acpi_ex_pci_bar_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
@@ -466,10 +466,10 @@ acpi_ex_pci_bar_space_handler(u32 function,
 *
 * FUNCTION:    acpi_ex_data_table_space_handler
 *
- * PARAMETERS:  Function            - Read or Write operation
+ * PARAMETERS:  function            - Read or Write operation
- *              Address             - Where in the space to read or write
+ *              address             - Where in the space to read or write
 *              bit_width           - Field width in bits (8, 16, or 32)
- *              Value               - Pointer to in or out value
+ *              value               - Pointer to in or out value
 *              handler_context     - Pointer to Handler's context
 *              region_context      - Pointer to context specific to the
 *                                    accessed region
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 6e335dc34528..bbf40ac27585 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -147,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
        stack_desc = *stack_ptr;
-        /* This is a union acpi_operand_object    */
+        /* This is an object of type union acpi_operand_object */
        switch (stack_desc->common.type) {
        case ACPI_TYPE_LOCAL_REFERENCE:
@@ -321,7 +321,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 * FUNCTION:    acpi_ex_resolve_multiple
 *
 * PARAMETERS:  walk_state          - Current state (contains AML opcode)
- *              Operand             - Starting point for resolution
+ *              operand             - Starting point for resolution
 *              return_type         - Where the object type is returned
 *              return_desc         - Where the resolved object is returned
 *
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index a67b1d925ddd..f232fbabdea8 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -113,7 +113,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
 *
 * FUNCTION:    acpi_ex_resolve_operands
 *
- * PARAMETERS:  Opcode              - Opcode being interpreted
+ * PARAMETERS:  opcode              - Opcode being interpreted
 *              stack_ptr           - Pointer to the operand stack to be
 *                                    resolved
 *              walk_state          - Current state
@@ -307,7 +307,7 @@ acpi_ex_resolve_operands(u16 opcode,
                case ARGI_DEVICE_REF:
                case ARGI_TARGETREF:    /* Allows implicit conversion rules before store */
                case ARGI_FIXED_TARGET: /* No implicit conversion before store to target */
-                case ARGI_SIMPLE_TARGET:        /* Name, Local, or Arg - no implicit conversion  */
+                case ARGI_SIMPLE_TARGET:        /* Name, Local, or arg - no implicit conversion  */
                        /*
                         * Need an operand of type ACPI_TYPE_LOCAL_REFERENCE
@@ -410,7 +410,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        /*
                         * Need an operand of type ACPI_TYPE_INTEGER,
                         * But we can implicitly convert from a STRING or BUFFER
-                         * Aka - "Implicit Source Operand Conversion"
+                         * aka - "Implicit Source Operand Conversion"
                         */
                        status =
                            acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
@@ -437,7 +437,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        /*
                         * Need an operand of type ACPI_TYPE_BUFFER,
                         * But we can implicitly convert from a STRING or INTEGER
-                         * Aka - "Implicit Source Operand Conversion"
+                         * aka - "Implicit Source Operand Conversion"
                         */
                        status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
                        if (ACPI_FAILURE(status)) {
@@ -463,7 +463,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        /*
                         * Need an operand of type ACPI_TYPE_STRING,
                         * But we can implicitly convert from a BUFFER or INTEGER
-                         * Aka - "Implicit Source Operand Conversion"
+                         * aka - "Implicit Source Operand Conversion"
                         */
                        status = acpi_ex_convert_to_string(obj_desc, stack_ptr,
                                                           ACPI_IMPLICIT_CONVERT_HEX);
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index c6cf843cc4c9..5fffe7ab5ece 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -62,8 +62,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *val_desc,
 * FUNCTION:    acpi_ex_store
 *
 * PARAMETERS:  *source_desc        - Value to be stored
- *              *dest_desc          - Where to store it.  Must be an NS node
+ *              *dest_desc          - Where to store it. Must be an NS node
- *                                    or a union acpi_operand_object of type
+ *                                    or union acpi_operand_object of type
 *                                    Reference;
 *              walk_state          - Current walk state
 *
@@ -361,7 +361,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
 * FUNCTION:    acpi_ex_store_object_to_node
 *
 * PARAMETERS:  source_desc             - Value to be stored
- *              Node                    - Named object to receive the value
+ *              node                    - Named object to receive the value
 *              walk_state              - Current walk state
 *              implicit_conversion     - Perform implicit conversion (yes/no)
 *
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index 65a45d8335c8..53c248473547 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -110,7 +110,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
                 * NOTE: ACPI versions up to 3.0 specified that the buffer must be
                 * truncated if the string is smaller than the buffer.  However, "other"
                 * implementations of ACPI never did this and thus became the defacto
-                 * standard. ACPI 3.0_a changes this behavior such that the buffer
+                 * standard. ACPI 3.0A changes this behavior such that the buffer
                 * is no longer truncated.
                 */
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 191a12945226..b760641e2fc6 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("exsystem")
 *
 * FUNCTION:    acpi_ex_system_wait_semaphore
 *
- * PARAMETERS:  Semaphore       - Semaphore to wait on
+ * PARAMETERS:  semaphore       - Semaphore to wait on
- *              Timeout         - Max time to wait
+ *              timeout         - Max time to wait
 *
 * RETURN:      Status
 *
@@ -98,8 +98,8 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 *
 * FUNCTION:    acpi_ex_system_wait_mutex
 *
- * PARAMETERS:  Mutex           - Mutex to wait on
+ * PARAMETERS:  mutex           - Mutex to wait on
- *              Timeout         - Max time to wait
+ *              timeout         - Max time to wait
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index eb6798ba8b59..d1ab7917eed7 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void)
 *
 * DESCRIPTION: Reacquire the interpreter execution region from within the
 *              interpreter code. Failure to enter the interpreter region is a
- *              fatal system error. Used in  conjunction with
+ *              fatal system error. Used in conjunction with
 *              relinquish_interpreter
 *
 ******************************************************************************/
@@ -317,8 +317,8 @@ void acpi_ex_release_global_lock(u32 field_flags)
 *
 * FUNCTION:    acpi_ex_digits_needed
 *
- * PARAMETERS:  Value           - Value to be represented
+ * PARAMETERS:  value           - Value to be represented
- *              Base            - Base of representation
+ *              base            - Base of representation
 *
 * RETURN:      The number of digits.
 *
@@ -408,7 +408,7 @@ void acpi_ex_eisa_id_to_string(char *out_string, u64 compressed_id)
 * PARAMETERS:  out_string      - Where to put the converted string. At least
 *                                21 bytes are needed to hold the largest
 *                                possible 64-bit integer.
- *              Value           - Value to be converted
+ *              value           - Value to be converted
 *
 * RETURN:      None, string
 *
@@ -443,7 +443,7 @@ void acpi_ex_integer_to_string(char *out_string, u64 value)
 *
 * RETURN:      TRUE if valid/supported ID.
 *
- * DESCRIPTION: Validate an operation region space_iD.
+ * DESCRIPTION: Validate an operation region space_ID.
 *
 ******************************************************************************/
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index d0b9ed5df97e..a1e71d0ef57b 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("hwacpi")
 *
 * FUNCTION:    acpi_hw_set_mode
 *
- * PARAMETERS:  Mode            - SYS_MODE_ACPI or SYS_MODE_LEGACY
+ * PARAMETERS:  mode            - SYS_MODE_ACPI or SYS_MODE_LEGACY
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c
index 29e859293edd..48518dac5342 100644
--- a/drivers/acpi/acpica/hwesleep.c
+++ b/drivers/acpi/acpica/hwesleep.c
@@ -90,7 +90,7 @@ void acpi_hw_execute_sleep_method(char *method_pathname, u32 integer_argument)
 * FUNCTION:    acpi_hw_extended_sleep
 *
 * PARAMETERS:  sleep_state         - Which sleep state to enter
- *              Flags               - ACPI_EXECUTE_GTS to run optional method
+ *              flags               - ACPI_EXECUTE_GTS to run optional method
 *
 * RETURN:      Status
 *
@@ -117,7 +117,8 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)
        /* Clear wake status (WAK_STS) */
-        status = acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
+        status =
+            acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
@@ -147,7 +148,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)
            ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &
             ACPI_X_SLEEP_TYPE_MASK);
-        status = acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE),
+        status = acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),
                            &acpi_gbl_FADT.sleep_control);
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
@@ -171,7 +172,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags)
 * FUNCTION:    acpi_hw_extended_wake_prep
 *
 * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *              Flags               - ACPI_EXECUTE_BFS to run optional method
+ *              flags               - ACPI_EXECUTE_BFS to run optional method
 *
 * RETURN:      Status
 *
@@ -195,7 +196,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags)
                    ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &
                     ACPI_X_SLEEP_TYPE_MASK);
-                (void)acpi_write((sleep_type_value | ACPI_X_SLEEP_ENABLE),
+                (void)acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),
                                 &acpi_gbl_FADT.sleep_control);
        }
@@ -212,7 +213,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags)
 * FUNCTION:    acpi_hw_extended_wake
 *
 * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *              Flags               - Reserved, set to zero
+ *              flags               - Reserved, set to zero
 *
 * RETURN:      Status
 *
@@ -239,7 +240,7 @@ acpi_status acpi_hw_extended_wake(u8 sleep_state, u8 flags)
         * and use it to determine whether the system is rebooting or
         * resuming. Clear WAK_STS for compatibility.
         */
-        (void)acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
+        (void)acpi_write((u64)ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);
        acpi_gbl_system_awake_and_running = TRUE;
        acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 6b6c83b87b52..4af6d20ef077 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -69,9 +69,9 @@ acpi_hw_write_multiple(u32 value,
 *
 * FUNCTION:    acpi_hw_validate_register
 *
- * PARAMETERS:  Reg                 - GAS register structure
+ * PARAMETERS:  reg                 - GAS register structure
 *              max_bit_width       - Max bit_width supported (32 or 64)
- *              Address             - Pointer to where the gas->address
+ *              address             - Pointer to where the gas->address
 *                                    is returned
 *
 * RETURN:      Status
@@ -102,7 +102,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
                return (AE_BAD_ADDRESS);
        }
-        /* Validate the space_iD */
+        /* Validate the space_ID */
        if ((reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
            (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
@@ -137,8 +137,8 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
 *
 * FUNCTION:    acpi_hw_read
 *
- * PARAMETERS:  Value               - Where the value is returned
+ * PARAMETERS:  value               - Where the value is returned
- *              Reg                 - GAS register structure
+ *              reg                 - GAS register structure
 *
 * RETURN:      Status
 *
@@ -148,7 +148,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
 *
 * LIMITATIONS: <These limitations also apply to acpi_hw_write>
 *      bit_width must be exactly 8, 16, or 32.
- *      space_iD must be system_memory or system_iO.
+ *      space_ID must be system_memory or system_IO.
 *      bit_offset and access_width are currently ignored, as there has
 *          not been a need to implement these.
 *
@@ -200,8 +200,8 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
 *
 * FUNCTION:    acpi_hw_write
 *
- * PARAMETERS:  Value               - Value to be written
+ * PARAMETERS:  value               - Value to be written
- *              Reg                 - GAS register structure
+ *              reg                 - GAS register structure
 *
 * RETURN:      Status
 *
@@ -439,7 +439,7 @@ acpi_hw_register_read(u32 register_id, u32 * return_value)
 * FUNCTION:    acpi_hw_register_write
 *
 * PARAMETERS:  register_id         - ACPI Register ID
- *              Value               - The value to write
+ *              value               - The value to write
 *
 * RETURN:      Status
 *
@@ -571,7 +571,7 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value)
 *
 * FUNCTION:    acpi_hw_read_multiple
 *
- * PARAMETERS:  Value               - Where the register value is returned
+ * PARAMETERS:  value               - Where the register value is returned
 *              register_a           - First ACPI register (required)
 *              register_b           - Second ACPI register (optional)
 *
@@ -624,7 +624,7 @@ acpi_hw_read_multiple(u32 *value,
 *
 * FUNCTION:    acpi_hw_write_multiple
 *
- * PARAMETERS:  Value               - The value to write
+ * PARAMETERS:  value               - The value to write
 *              register_a           - First ACPI register (required)
 *              register_b           - Second ACPI register (optional)
 *
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 615996a36bed..9960fe9ef533 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("hwsleep")
 * FUNCTION:    acpi_hw_legacy_sleep
 *
 * PARAMETERS:  sleep_state         - Which sleep state to enter
- *              Flags               - ACPI_EXECUTE_GTS to run optional method
+ *              flags               - ACPI_EXECUTE_GTS to run optional method
 *
 * RETURN:      Status
 *
@@ -214,7 +214,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state, u8 flags)
 * FUNCTION:    acpi_hw_legacy_wake_prep
 *
 * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *              Flags               - ACPI_EXECUTE_BFS to run optional method
+ *              flags               - ACPI_EXECUTE_BFS to run optional method
 *
 * RETURN:      Status
 *
@@ -288,7 +288,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state, u8 flags)
 * FUNCTION:    acpi_hw_legacy_wake
 *
 * PARAMETERS:  sleep_state         - Which sleep state we just exited
- *              Flags               - Reserved, set to zero
+ *              flags               - Reserved, set to zero
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index f1b2c3b94cac..b6411f16832f 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("hwtimer")
 *
 * FUNCTION:    acpi_get_timer_resolution
 *
- * PARAMETERS:  Resolution          - Where the resolution is returned
+ * PARAMETERS:  resolution          - Where the resolution is returned
 *
 * RETURN:      Status and timer resolution
 *
@@ -84,7 +84,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution)
 *
 * FUNCTION:    acpi_get_timer
 *
- * PARAMETERS:  Ticks               - Where the timer value is returned
+ * PARAMETERS:  ticks               - Where the timer value is returned
 *
 * RETURN:      Status and current timer value (ticks)
 *
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index 6e5c43a60bb7..c99d546b217f 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -58,7 +58,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width);
 *
 * The table is used to implement the Microsoft port access rules that
 * first appeared in Windows XP. Some ports are always illegal, and some
- * ports are only illegal if the BIOS calls _OSI with a win_xP string or
+ * ports are only illegal if the BIOS calls _OSI with a win_XP string or
 * later (meaning that the BIOS itelf is post-XP.)
 *
 * This provides ACPICA with the desired port protections and
@@ -66,7 +66,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width);
 *
 * Description of port entries:
 *  DMA:   DMA controller
- *  PIC0:  Programmable Interrupt Controller (8259_a)
+ *  PIC0:  Programmable Interrupt Controller (8259A)
 *  PIT1:  System Timer 1
 *  PIT2:  System Timer 2 failsafe
 *  RTC:   Real-time clock
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index a716fede4f25..7bfd649d1996 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -104,8 +104,8 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
 *
 * FUNCTION:    acpi_read
 *
- * PARAMETERS:  Value               - Where the value is returned
+ * PARAMETERS:  value               - Where the value is returned
- *              Reg                 - GAS register structure
+ *              reg                 - GAS register structure
 *
 * RETURN:      Status
 *
@@ -113,7 +113,7 @@ ACPI_EXPORT_SYMBOL(acpi_reset)
 *
 * LIMITATIONS: <These limitations also apply to acpi_write>
 *      bit_width must be exactly 8, 16, 32, or 64.
- *      space_iD must be system_memory or system_iO.
+ *      space_ID must be system_memory or system_IO.
 *      bit_offset and access_width are currently ignored, as there has
 *          not been a need to implement these.
 *
@@ -196,8 +196,8 @@ ACPI_EXPORT_SYMBOL(acpi_read)
 *
 * FUNCTION:    acpi_write
 *
- * PARAMETERS:  Value               - Value to be written
+ * PARAMETERS:  value               - Value to be written
- *              Reg                 - GAS register structure
+ *              reg                 - GAS register structure
 *
 * RETURN:      Status
 *
@@ -441,7 +441,7 @@ ACPI_EXPORT_SYMBOL(acpi_write_bit_register)
 *              *sleep_type_a        - Where SLP_TYPa is returned
 *              *sleep_type_b        - Where SLP_TYPb is returned
 *
- * RETURN:      Status - ACPI status
+ * RETURN:      status - ACPI status
 *
 * DESCRIPTION: Obtain the SLP_TYPa and SLP_TYPb values for the requested sleep
 *              state.
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 762d059bb508..f8684bfe7907 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -205,7 +205,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
        ACPI_FLUSH_CPU_CACHE();
        status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
-                                    (u32)acpi_gbl_FADT.S4bios_request, 8);
+                                    (u32)acpi_gbl_FADT.s4_bios_request, 8);
        do {
                acpi_os_stall(1000);
@@ -349,7 +349,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
 * FUNCTION:    acpi_enter_sleep_state
 *
 * PARAMETERS:  sleep_state         - Which sleep state to enter
- *              Flags               - ACPI_EXECUTE_GTS to run optional method
+ *              flags               - ACPI_EXECUTE_GTS to run optional method
 *
 * RETURN:      Status
 *
@@ -382,7 +382,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state)
 * FUNCTION:    acpi_leave_sleep_state_prep
 *
 * PARAMETERS:  sleep_state         - Which sleep state we are exiting
- *              Flags               - ACPI_EXECUTE_BFS to run optional method
+ *              flags               - ACPI_EXECUTE_BFS to run optional method
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 61623f3f6826..23db53ce2293 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -157,7 +157,7 @@ acpi_status acpi_ns_root_initialize(void)
 #if defined (ACPI_ASL_COMPILER)
-                                /* Save the parameter count for the i_aSL compiler */
+                                /* Save the parameter count for the iASL compiler */
                                new_node->value = obj_desc->method.param_count;
 #else
@@ -258,11 +258,11 @@ acpi_status acpi_ns_root_initialize(void)
 * FUNCTION:    acpi_ns_lookup
 *
 * PARAMETERS:  scope_info      - Current scope info block
- *              Pathname        - Search pathname, in internal format
+ *              pathname        - Search pathname, in internal format
 *                                (as represented in the AML stream)
- *              Type            - Type associated with name
+ *              type            - Type associated with name
 *              interpreter_mode - IMODE_LOAD_PASS2 => add name if not found
- *              Flags           - Flags describing the search restrictions
+ *              flags           - Flags describing the search restrictions
 *              walk_state      - Current state of the walk
 *              return_node     - Where the Node is placed (if found
 *                                or created successfully)
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 7c3d3ceb98b3..ac389e5bb594 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("nsalloc")
 *
 * FUNCTION:    acpi_ns_create_node
 *
- * PARAMETERS:  Name            - Name of the new node (4 char ACPI name)
+ * PARAMETERS:  name            - Name of the new node (4 char ACPI name)
 *
 * RETURN:      New namespace node (Null on failure)
 *
@@ -92,7 +92,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
 *
 * FUNCTION:    acpi_ns_delete_node
 *
- * PARAMETERS:  Node            - Node to be deleted
+ * PARAMETERS:  node            - Node to be deleted
 *
 * RETURN:      None
 *
@@ -143,7 +143,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
 *
 * FUNCTION:    acpi_ns_remove_node
 *
- * PARAMETERS:  Node            - Node to be removed/deleted
+ * PARAMETERS:  node            - Node to be removed/deleted
 *
 * RETURN:      None
 *
@@ -196,8 +196,8 @@ void acpi_ns_remove_node(struct acpi_namespace_node *node)
 *
 * PARAMETERS:  walk_state      - Current state of the walk
 *              parent_node     - The parent of the new Node
- *              Node            - The new Node to install
+ *              node            - The new Node to install
- *              Type            - ACPI object type of the new Node
+ *              type            - ACPI object type of the new Node
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 3f7f3f6e7dd5..7ee4e6aeb0a2 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -63,7 +63,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
 * FUNCTION:    acpi_ns_print_pathname
 *
 * PARAMETERS:  num_segments        - Number of ACPI name segments
- *              Pathname            - The compressed (internal) path
+ *              pathname            - The compressed (internal) path
 *
 * RETURN:      None
 *
@@ -107,10 +107,10 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)
 *
 * FUNCTION:    acpi_ns_dump_pathname
 *
- * PARAMETERS:  Handle              - Object
+ * PARAMETERS:  handle              - Object
- *              Msg                 - Prefix message
+ *              msg                 - Prefix message
- *              Level               - Desired debug level
+ *              level               - Desired debug level
- *              Component           - Caller's component ID
+ *              component           - Caller's component ID
 *
 * RETURN:      None
 *
@@ -143,8 +143,8 @@ acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component)
 * FUNCTION:    acpi_ns_dump_one_object
 *
 * PARAMETERS:  obj_handle          - Node to be dumped
- *              Level               - Nesting level of the handle
+ *              level               - Nesting level of the handle
- *              Context             - Passed into walk_namespace
+ *              context             - Passed into walk_namespace
 *              return_value        - Not used
 *
 * RETURN:      Status
@@ -615,7 +615,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
 *
 * FUNCTION:    acpi_ns_dump_objects
 *
- * PARAMETERS:  Type                - Object type to be dumped
+ * PARAMETERS:  type                - Object type to be dumped
 *              display_type        - 0 or ACPI_DISPLAY_SUMMARY
 *              max_depth           - Maximum depth of dump. Use ACPI_UINT32_MAX
 *                                    for an effectively unlimited depth.
@@ -671,7 +671,7 @@ acpi_ns_dump_objects(acpi_object_type type,
 *
 * FUNCTION:    acpi_ns_dump_entry
 *
- * PARAMETERS:  Handle              - Node to be dumped
+ * PARAMETERS:  handle              - Node to be dumped
 *              debug_level         - Output level
 *
 * RETURN:      None
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 3b5acb0eb406..944d4c8d9438 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -55,9 +55,9 @@ ACPI_MODULE_NAME("nsdumpdv")
 *
 * FUNCTION:    acpi_ns_dump_one_device
 *
- * PARAMETERS:  Handle              - Node to be dumped
+ * PARAMETERS:  handle              - Node to be dumped
- *              Level               - Nesting level of the handle
+ *              level               - Nesting level of the handle
- *              Context             - Passed into walk_namespace
+ *              context             - Passed into walk_namespace
 *              return_value        - Not used
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index f375cb82e321..69074be498e8 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -59,11 +59,11 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
 *
 * FUNCTION:    acpi_ns_evaluate
 *
- * PARAMETERS:  Info            - Evaluation info block, contains:
+ * PARAMETERS:  info            - Evaluation info block, contains:
 *                  prefix_node     - Prefix or Method/Object Node to execute
- *                  Pathname        - Name of method to execute, If NULL, the
+ *                  pathname        - Name of method to execute, If NULL, the
 *                                    Node is the object to execute
- *                  Parameters      - List of parameters to pass to the method,
+ *                  parameters      - List of parameters to pass to the method,
 *                                    terminated by NULL. Params itself may be
 *                                    NULL if no parameters are being passed.
 *                  return_object   - Where to put method's return value (if
@@ -71,7 +71,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
 *                  parameter_type  - Type of Parameter list
 *                  return_object   - Where to put method's return value (if
 *                                    any). If NULL, no value is returned.
- *                  Flags           - ACPI_IGNORE_RETURN_VALUE to delete return
+ *                  flags           - ACPI_IGNORE_RETURN_VALUE to delete return
 *
 * RETURN:      Status
 *
@@ -351,7 +351,7 @@ void acpi_ns_exec_module_code_list(void)
 * FUNCTION:    acpi_ns_exec_module_code
 *
 * PARAMETERS:  method_obj          - Object container for the module-level code
- *              Info                - Info block for method evaluation
+ *              info                - Info block for method evaluation
 *
 * RETURN:      None. Exceptions during method execution are ignored, since
 *              we cannot abort a table load.
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 9d84ec2f0211..95ffe8dfa1f1 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -224,8 +224,8 @@ acpi_status acpi_ns_initialize_devices(void)
 * FUNCTION:    acpi_ns_init_one_object
 *
 * PARAMETERS:  obj_handle      - Node
- *              Level           - Current nesting level
+ *              level           - Current nesting level
- *              Context         - Points to a init info struct
+ *              context         - Points to a init info struct
 *              return_value    - Not used
 *
 * RETURN:      Status
@@ -530,7 +530,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                         * we will not run _INI, but we continue to examine the children
                         * of this device.
                         *
-                         * From the ACPI spec, description of _STA: (Note - no mention
+                         * From the ACPI spec, description of _STA: (note - no mention
                         * of whether to run _INI or not on the device in question)
                         *
                         * "_STA may return bit 0 clear (not present) with bit 3 set
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 5cbf15ffe7d8..76935ff29289 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -63,7 +63,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
 * FUNCTION:    acpi_ns_load_table
 *
 * PARAMETERS:  table_index     - Index for table to be loaded
- *              Node            - Owning NS node
+ *              node            - Owning NS node
 *
 * RETURN:      Status
 *
@@ -278,7 +278,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
 *
 *  FUNCTION:       acpi_ns_unload_name_space
 *
- *  PARAMETERS:     Handle          - Root of namespace subtree to be deleted
+ *  PARAMETERS:     handle          - Root of namespace subtree to be deleted
 *
 *  RETURN:         Status
 *
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index b20e7c8c3ffb..96e0eb609bb4 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("nsnames")
 *
 * FUNCTION:    acpi_ns_build_external_path
 *
- * PARAMETERS:  Node            - NS node whose pathname is needed
+ * PARAMETERS:  node            - NS node whose pathname is needed
- *              Size            - Size of the pathname
+ *              size            - Size of the pathname
 *              *name_buffer    - Where to return the pathname
 *
 * RETURN:      Status
@@ -120,7 +120,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_ns_get_external_pathname
 *
- * PARAMETERS:  Node            - Namespace node whose pathname is needed
+ * PARAMETERS:  node            - Namespace node whose pathname is needed
 *
 * RETURN:      Pointer to storage containing the fully qualified name of
 *              the node, In external format (name segments separated by path
@@ -168,7 +168,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 *
 * FUNCTION:    acpi_ns_get_pathname_length
 *
- * PARAMETERS:  Node        - Namespace node
+ * PARAMETERS:  node        - Namespace node
 *
 * RETURN:      Length of path, including prefix
 *
@@ -214,7 +214,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
 *
 * PARAMETERS:  target_handle           - Handle of named object whose name is
 *                                        to be found
- *              Buffer                  - Where the pathname is returned
+ *              buffer                  - Where the pathname is returned
 *
 * RETURN:      Status, Buffer is filled with pathname if status is AE_OK
 *
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index dd77a3ce6e50..d6c9a3cc6716 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -53,9 +53,9 @@ ACPI_MODULE_NAME("nsobject")
 *
 * FUNCTION:    acpi_ns_attach_object
 *
- * PARAMETERS:  Node                - Parent Node
+ * PARAMETERS:  node                - Parent Node
- *              Object              - Object to be attached
+ *              object              - Object to be attached
- *              Type                - Type of object, or ACPI_TYPE_ANY if not
+ *              type                - Type of object, or ACPI_TYPE_ANY if not
 *                                    known
 *
 * RETURN:      Status
@@ -191,7 +191,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_ns_detach_object
 *
- * PARAMETERS:  Node           - A Namespace node whose object will be detached
+ * PARAMETERS:  node           - A Namespace node whose object will be detached
 *
 * RETURN:      None.
 *
@@ -250,7 +250,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
 *
 * FUNCTION:    acpi_ns_get_attached_object
 *
- * PARAMETERS:  Node             - Namespace node
+ * PARAMETERS:  node             - Namespace node
 *
 * RETURN:      Current value of the object field from the Node whose
 *              handle is passed
@@ -285,7 +285,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
 *
 * FUNCTION:    acpi_ns_get_secondary_object
 *
- * PARAMETERS:  Node             - Namespace node
+ * PARAMETERS:  node             - Namespace node
 *
 * RETURN:      Current value of the object field from the Node whose
 *              handle is passed.
@@ -315,9 +315,9 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
 *
 * FUNCTION:    acpi_ns_attach_data
 *
- * PARAMETERS:  Node            - Namespace node
+ * PARAMETERS:  node            - Namespace node
- *              Handler         - Handler to be associated with the data
+ *              handler         - Handler to be associated with the data
- *              Data            - Data to be attached
+ *              data            - Data to be attached
 *
 * RETURN:      Status
 *
@@ -372,8 +372,8 @@ acpi_ns_attach_data(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_ns_detach_data
 *
- * PARAMETERS:  Node            - Namespace node
+ * PARAMETERS:  node            - Namespace node
- *              Handler         - Handler associated with the data
+ *              handler         - Handler associated with the data
 *
 * RETURN:      Status
 *
@@ -416,9 +416,9 @@ acpi_ns_detach_data(struct acpi_namespace_node * node,
 *
 * FUNCTION:    acpi_ns_get_attached_data
 *
- * PARAMETERS:  Node            - Namespace node
+ * PARAMETERS:  node            - Namespace node
- *              Handler         - Handler associated with the data
+ *              handler         - Handler associated with the data
- *              Data            - Where the data is returned
+ *              data            - Where the data is returned
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index fe6626035495..2419f417ea33 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -116,7 +116,7 @@ static const char *acpi_rtype_names[] = {
 *
 * FUNCTION:    acpi_ns_check_predefined_names
 *
- * PARAMETERS:  Node            - Namespace node for the method/object
+ * PARAMETERS:  node            - Namespace node for the method/object
 *              user_param_count - Number of parameters actually passed
 *              return_status   - Status from the object evaluation
 *              return_object_ptr - Pointer to the object returned from the
@@ -275,10 +275,10 @@ cleanup:
 *
 * FUNCTION:    acpi_ns_check_parameter_count
 *
- * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ * PARAMETERS:  pathname        - Full pathname to the node (for error msgs)
- *              Node            - Namespace node for the method/object
+ *              node            - Namespace node for the method/object
 *              user_param_count - Number of args passed in by the caller
- *              Predefined      - Pointer to entry in predefined name table
+ *              predefined      - Pointer to entry in predefined name table
 *
 * RETURN:      None
 *
@@ -364,7 +364,7 @@ acpi_ns_check_parameter_count(char *pathname,
 *
 * FUNCTION:    acpi_ns_check_for_predefined_name
 *
- * PARAMETERS:  Node            - Namespace node for the method/object
+ * PARAMETERS:  node            - Namespace node for the method/object
 *
 * RETURN:      Pointer to entry in predefined table. NULL indicates not found.
 *
@@ -410,7 +410,7 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
 *
 * FUNCTION:    acpi_ns_check_package
 *
- * PARAMETERS:  Data            - Pointer to validation data structure
+ * PARAMETERS:  data            - Pointer to validation data structure
 *              return_object_ptr - Pointer to the object returned from the
 *                                evaluation of a method or object
 *
@@ -685,11 +685,11 @@ package_too_small:
 *
 * FUNCTION:    acpi_ns_check_package_list
 *
- * PARAMETERS:  Data            - Pointer to validation data structure
+ * PARAMETERS:  data            - Pointer to validation data structure
- *              Package         - Pointer to package-specific info for method
+ *              package         - Pointer to package-specific info for method
- *              Elements        - Element list of parent package. All elements
+ *              elements        - Element list of parent package. All elements
 *                                of this list should be of type Package.
- *              Count           - Count of subpackages
+ *              count           - Count of subpackages
 *
 * RETURN:      Status
 *
@@ -911,12 +911,12 @@ package_too_small:
 *
 * FUNCTION:    acpi_ns_check_package_elements
 *
- * PARAMETERS:  Data            - Pointer to validation data structure
+ * PARAMETERS:  data            - Pointer to validation data structure
- *              Elements        - Pointer to the package elements array
+ *              elements        - Pointer to the package elements array
- *              Type1           - Object type for first group
+ *              type1           - Object type for first group
- *              Count1          - Count for first group
+ *              count1          - Count for first group
- *              Type2           - Object type for second group
+ *              type2           - Object type for second group
- *              Count2          - Count for second group
+ *              count2          - Count for second group
 *              start_index     - Start of the first group of elements
 *
 * RETURN:      Status
@@ -968,7 +968,7 @@ acpi_ns_check_package_elements(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_check_object_type
 *
- * PARAMETERS:  Data            - Pointer to validation data structure
+ * PARAMETERS:  data            - Pointer to validation data structure
 *              return_object_ptr - Pointer to the object returned from the
 *                                evaluation of a method or object
 *              expected_btypes - Bitmap of expected return type(s)
@@ -1102,7 +1102,7 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_check_reference
 *
- * PARAMETERS:  Data            - Pointer to validation data structure
+ * PARAMETERS:  data            - Pointer to validation data structure
 *              return_object   - Object returned from the evaluation of a
 *                                method or object
 *
@@ -1140,7 +1140,7 @@ acpi_ns_check_reference(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_get_expected_types
 *
- * PARAMETERS:  Buffer          - Pointer to where the string is returned
+ * PARAMETERS:  buffer          - Pointer to where the string is returned
 *              expected_btypes - Bitmap of expected return type(s)
 *
 * RETURN:      Buffer is populated with type names.
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 5519a64a353f..8c5f292860fc 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -94,7 +94,7 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
 *
 * FUNCTION:    acpi_ns_repair_object
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              expected_btypes     - Object types expected
 *              package_index       - Index of object within parent package (if
 *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -470,7 +470,7 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
 *
 * FUNCTION:    acpi_ns_repair_null_element
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              expected_btypes     - Object types expected
 *              package_index       - Index of object within parent package (if
 *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
@@ -509,17 +509,17 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
         */
        if (expected_btypes & ACPI_RTYPE_INTEGER) {
-                /* Need an Integer - create a zero-value integer */
+                /* Need an integer - create a zero-value integer */
                new_object = acpi_ut_create_integer_object((u64)0);
        } else if (expected_btypes & ACPI_RTYPE_STRING) {
-                /* Need a String - create a NULL string */
+                /* Need a string - create a NULL string */
                new_object = acpi_ut_create_string_object(0);
        } else if (expected_btypes & ACPI_RTYPE_BUFFER) {
-                /* Need a Buffer - create a zero-length buffer */
+                /* Need a buffer - create a zero-length buffer */
                new_object = acpi_ut_create_buffer_object(0);
        } else {
@@ -552,7 +552,7 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_remove_null_elements
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              package_type        - An acpi_return_package_types value
 *              obj_desc            - A Package object
 *
@@ -635,7 +635,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_wrap_with_package
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              original_object     - Pointer to the object to repair.
 *              obj_desc_ptr        - The new package object is returned here
 *
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 726bc8e687f7..90189251cdf0 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -149,8 +149,8 @@ static const struct acpi_repair_info acpi_ns_repairable_names[] = {
 *
 * FUNCTION:    acpi_ns_complex_repairs
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
- *              Node                - Namespace node for the method/object
+ *              node                - Namespace node for the method/object
 *              validate_status     - Original status of earlier validation
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
@@ -187,7 +187,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_match_repairable_name
 *
- * PARAMETERS:  Node                - Namespace node for the method/object
+ * PARAMETERS:  node                - Namespace node for the method/object
 *
 * RETURN:      Pointer to entry in repair table. NULL indicates not found.
 *
@@ -218,7 +218,7 @@ static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct
 *
 * FUNCTION:    acpi_ns_repair_ALR
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -247,7 +247,7 @@ acpi_ns_repair_ALR(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_repair_FDE
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -335,7 +335,7 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_repair_CID
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -405,7 +405,7 @@ acpi_ns_repair_CID(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_repair_HID
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -487,7 +487,7 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_repair_TSS
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -531,7 +531,7 @@ acpi_ns_repair_TSS(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_repair_PSS
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object_ptr   - Pointer to the object returned from the
 *                                    evaluation of a method or object
 *
@@ -600,7 +600,7 @@ acpi_ns_repair_PSS(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_check_sorted_list
 *
- * PARAMETERS:  Data                - Pointer to validation data structure
+ * PARAMETERS:  data                - Pointer to validation data structure
 *              return_object       - Pointer to the top-level returned object
 *              expected_count      - Minimum length of each sub-package
 *              sort_index          - Sub-package entry to sort on
@@ -707,9 +707,9 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
 *
 * FUNCTION:    acpi_ns_sort_list
 *
- * PARAMETERS:  Elements            - Package object element list
+ * PARAMETERS:  elements            - Package object element list
- *              Count               - Element count for above
+ *              count               - Element count for above
- *              Index               - Sort by which package element
+ *              index               - Sort by which package element
 *              sort_direction      - Ascending or Descending sort
 *
 * RETURN:      None
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 507043d66114..456cc859f869 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -65,7 +65,7 @@ acpi_ns_search_parent_tree(u32 target_name,
 *
 * PARAMETERS:  target_name     - Ascii ACPI name to search for
 *              parent_node     - Starting node where search will begin
- *              Type            - Object type to match
+ *              type            - Object type to match
 *              return_node     - Where the matched Named obj is returned
 *
 * RETURN:      Status
@@ -175,8 +175,8 @@ acpi_ns_search_one_scope(u32 target_name,
 * FUNCTION:    acpi_ns_search_parent_tree
 *
 * PARAMETERS:  target_name     - Ascii ACPI name to search for
- *              Node            - Starting node where search will begin
+ *              node            - Starting node where search will begin
- *              Type            - Object type to match
+ *              type            - Object type to match
 *              return_node     - Where the matched Node is returned
 *
 * RETURN:      Status
@@ -264,11 +264,11 @@ acpi_ns_search_parent_tree(u32 target_name,
 *
 * PARAMETERS:  target_name         - Ascii ACPI name to search for (4 chars)
 *              walk_state          - Current state of the walk
- *              Node                - Starting node where search will begin
+ *              node                - Starting node where search will begin
 *              interpreter_mode    - Add names only in ACPI_MODE_LOAD_PASS_x.
 *                                    Otherwise,search only.
- *              Type                - Object type to match
+ *              type                - Object type to match
- *              Flags               - Flags describing the search restrictions
+ *              flags               - Flags describing the search restrictions
 *              return_node         - Where the Node is returned
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 75113759f69d..ef753a41e087 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -62,8 +62,8 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 *
 * FUNCTION:    acpi_ns_print_node_pathname
 *
- * PARAMETERS:  Node            - Object
+ * PARAMETERS:  node            - Object
- *              Message         - Prefix message
+ *              message         - Prefix message
 *
 * DESCRIPTION: Print an object's full namespace pathname
 *              Manages allocation/freeing of a pathname buffer
@@ -101,7 +101,7 @@ acpi_ns_print_node_pathname(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_ns_valid_root_prefix
 *
- * PARAMETERS:  Prefix          - Character to be checked
+ * PARAMETERS:  prefix          - Character to be checked
 *
 * RETURN:      TRUE if a valid prefix
 *
@@ -119,7 +119,7 @@ u8 acpi_ns_valid_root_prefix(char prefix)
 *
 * FUNCTION:    acpi_ns_valid_path_separator
 *
- * PARAMETERS:  Sep         - Character to be checked
+ * PARAMETERS:  sep         - Character to be checked
 *
 * RETURN:      TRUE if a valid path separator
 *
@@ -137,7 +137,7 @@ static u8 acpi_ns_valid_path_separator(char sep)
 *
 * FUNCTION:    acpi_ns_get_type
 *
- * PARAMETERS:  Node        - Parent Node to be examined
+ * PARAMETERS:  node        - Parent Node to be examined
 *
 * RETURN:      Type field from Node whose handle is passed
 *
@@ -161,7 +161,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
 *
 * FUNCTION:    acpi_ns_local
 *
- * PARAMETERS:  Type        - A namespace object type
+ * PARAMETERS:  type        - A namespace object type
 *
 * RETURN:      LOCAL if names must be found locally in objects of the
 *              passed type, 0 if enclosing scopes should be searched
@@ -189,7 +189,7 @@ u32 acpi_ns_local(acpi_object_type type)
 *
 * FUNCTION:    acpi_ns_get_internal_name_length
 *
- * PARAMETERS:  Info            - Info struct initialized with the
+ * PARAMETERS:  info            - Info struct initialized with the
 *                                external name pointer.
 *
 * RETURN:      None
@@ -260,7 +260,7 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
 *
 * FUNCTION:    acpi_ns_build_internal_name
 *
- * PARAMETERS:  Info            - Info struct fully initialized
+ * PARAMETERS:  info            - Info struct fully initialized
 *
 * RETURN:      Status
 *
@@ -371,7 +371,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
 * FUNCTION:    acpi_ns_internalize_name
 *
 * PARAMETERS:  *external_name          - External representation of name
- *              **Converted Name        - Where to return the resulting
+ *              **Converted name        - Where to return the resulting
 *                                        internal represention of the name
 *
 * RETURN:      Status
@@ -575,7 +575,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
 *
 * FUNCTION:    acpi_ns_validate_handle
 *
- * PARAMETERS:  Handle          - Handle to be validated and typecast to a
+ * PARAMETERS:  handle          - Handle to be validated and typecast to a
 *                                namespace node.
 *
 * RETURN:      A pointer to a namespace node
@@ -651,7 +651,7 @@ void acpi_ns_terminate(void)
 *
 * FUNCTION:    acpi_ns_opens_scope
 *
- * PARAMETERS:  Type        - A valid namespace type
+ * PARAMETERS:  type        - A valid namespace type
 *
 * RETURN:      NEWSCOPE if the passed type "opens a name scope" according
 *              to the ACPI specification, else 0
@@ -677,14 +677,14 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
 *
 * FUNCTION:    acpi_ns_get_node
 *
- * PARAMETERS:  *Pathname   - Name to be found, in external (ASL) format. The
+ * PARAMETERS:  *pathname   - Name to be found, in external (ASL) format. The
 *                            \ (backslash) and ^ (carat) prefixes, and the
 *                            . (period) to separate segments are supported.
 *              prefix_node  - Root of subtree to be searched, or NS_ALL for the
 *                            root of the name space.  If Name is fully
 *                            qualified (first s8 is '\'), the passed value
 *                            of Scope will not be accessed.
- *              Flags       - Used to indicate whether to perform upsearch or
+ *              flags       - Used to indicate whether to perform upsearch or
 *                            not.
 *              return_node - Where the Node is returned
 *
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index f69895a54895..730bccc5e7f7 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -88,7 +88,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
 *
 * FUNCTION:    acpi_ns_get_next_node_typed
 *
- * PARAMETERS:  Type                - Type of node to be searched for
+ * PARAMETERS:  type                - Type of node to be searched for
 *              parent_node         - Parent node whose children we are
 *                                    getting
 *              child_node          - Previous child that was found.
@@ -151,16 +151,16 @@ struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type,
 *
 * FUNCTION:    acpi_ns_walk_namespace
 *
- * PARAMETERS:  Type                - acpi_object_type to search for
+ * PARAMETERS:  type                - acpi_object_type to search for
 *              start_node          - Handle in namespace where search begins
 *              max_depth           - Depth to which search is to reach
- *              Flags               - Whether to unlock the NS before invoking
+ *              flags               - Whether to unlock the NS before invoking
 *                                    the callback routine
 *              pre_order_visit     - Called during tree pre-order visit
 *                                    when an object of "Type" is found
 *              post_order_visit    - Called during tree post-order visit
 *                                    when an object of "Type" is found
- *              Context             - Passed to user function(s) above
+ *              context             - Passed to user function(s) above
 *              return_value        - from the user_function if terminated
 *                                    early. Otherwise, returns NULL.
 * RETURNS:     Status
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index 71d15f61807b..9692e6702333 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -58,8 +58,8 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
 *
 * FUNCTION:    acpi_evaluate_object_typed
 *
- * PARAMETERS:  Handle              - Object handle (optional)
+ * PARAMETERS:  handle              - Object handle (optional)
- *              Pathname            - Object pathname (optional)
+ *              pathname            - Object pathname (optional)
 *              external_params     - List of parameters to pass to method,
 *                                    terminated by NULL.  May be NULL
 *                                    if no parameters are being passed.
@@ -152,8 +152,8 @@ ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
 *
 * FUNCTION:    acpi_evaluate_object
 *
- * PARAMETERS:  Handle              - Object handle (optional)
+ * PARAMETERS:  handle              - Object handle (optional)
- *              Pathname            - Object pathname (optional)
+ *              pathname            - Object pathname (optional)
 *              external_params     - List of parameters to pass to method,
 *                                    terminated by NULL.  May be NULL
 *                                    if no parameters are being passed.
@@ -364,7 +364,7 @@ ACPI_EXPORT_SYMBOL(acpi_evaluate_object)
 *
 * FUNCTION:    acpi_ns_resolve_references
 *
- * PARAMETERS:  Info                    - Evaluation info block
+ * PARAMETERS:  info                    - Evaluation info block
 *
 * RETURN:      Info->return_object is replaced with the dereferenced object
 *
@@ -431,14 +431,14 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
 *
 * FUNCTION:    acpi_walk_namespace
 *
- * PARAMETERS:  Type                - acpi_object_type to search for
+ * PARAMETERS:  type                - acpi_object_type to search for
 *              start_object        - Handle in namespace where search begins
 *              max_depth           - Depth to which search is to reach
 *              pre_order_visit     - Called during tree pre-order visit
 *                                    when an object of "Type" is found
 *              post_order_visit    - Called during tree post-order visit
 *                                    when an object of "Type" is found
- *              Context             - Passed to user function(s) above
+ *              context             - Passed to user function(s) above
 *              return_value        - Location where return value of
 *                                    user_function is put if terminated early
 *
@@ -646,7 +646,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
 *
 * PARAMETERS:  HID                 - HID to search for. Can be NULL.
 *              user_function       - Called when a matching object is found
- *              Context             - Passed to user function
+ *              context             - Passed to user function
 *              return_value        - Location where return value of
 *                                    user_function is put if terminated early
 *
@@ -716,8 +716,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_devices)
 * FUNCTION:    acpi_attach_data
 *
 * PARAMETERS:  obj_handle          - Namespace node
- *              Handler             - Handler for this attachment
+ *              handler             - Handler for this attachment
- *              Data                - Pointer to data to be attached
+ *              data                - Pointer to data to be attached
 *
 * RETURN:      Status
 *
@@ -764,7 +764,7 @@ ACPI_EXPORT_SYMBOL(acpi_attach_data)
 * FUNCTION:    acpi_detach_data
 *
 * PARAMETERS:  obj_handle          - Namespace node handle
- *              Handler             - Handler used in call to acpi_attach_data
+ *              handler             - Handler used in call to acpi_attach_data
 *
 * RETURN:      Status
 *
@@ -810,8 +810,8 @@ ACPI_EXPORT_SYMBOL(acpi_detach_data)
 * FUNCTION:    acpi_get_data
 *
 * PARAMETERS:  obj_handle          - Namespace node
- *              Handler             - Handler used in call to attach_data
+ *              handler             - Handler used in call to attach_data
- *              Data                - Where the data is returned
+ *              data                - Where the data is returned
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index af401c9c4dfc..08e9610b34ca 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -61,8 +61,8 @@ static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
 *
 * FUNCTION:    acpi_get_handle
 *
- * PARAMETERS:  Parent          - Object to search under (search scope).
+ * PARAMETERS:  parent          - Object to search under (search scope).
- *              Pathname        - Pointer to an asciiz string containing the
+ *              pathname        - Pointer to an asciiz string containing the
 *                                name
 *              ret_handle      - Where the return handle is returned
 *
@@ -142,9 +142,9 @@ ACPI_EXPORT_SYMBOL(acpi_get_handle)
 *
 * FUNCTION:    acpi_get_name
 *
- * PARAMETERS:  Handle          - Handle to be converted to a pathname
+ * PARAMETERS:  handle          - Handle to be converted to a pathname
 *              name_type       - Full pathname or single segment
- *              Buffer          - Buffer for returned path
+ *              buffer          - Buffer for returned path
 *
 * RETURN:      Pointer to a string containing the fully qualified Name.
 *
@@ -219,8 +219,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_name)
 *
 * FUNCTION:    acpi_ns_copy_device_id
 *
- * PARAMETERS:  Dest                - Pointer to the destination DEVICE_ID
+ * PARAMETERS:  dest                - Pointer to the destination DEVICE_ID
- *              Source              - Pointer to the source DEVICE_ID
+ *              source              - Pointer to the source DEVICE_ID
 *              string_area         - Pointer to where to copy the dest string
 *
 * RETURN:      Pointer to the next string area
@@ -247,7 +247,7 @@ static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
 *
 * FUNCTION:    acpi_get_object_info
 *
- * PARAMETERS:  Handle              - Object Handle
+ * PARAMETERS:  handle              - Object Handle
 *              return_buffer       - Where the info is returned
 *
 * RETURN:      Status
@@ -493,7 +493,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_object_info)
 *
 * FUNCTION:    acpi_install_method
 *
- * PARAMETERS:  Buffer         - An ACPI table containing one control method
+ * PARAMETERS:  buffer         - An ACPI table containing one control method
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 880a605cee20..6766fc4f088f 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -98,7 +98,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_id)
 *
 * FUNCTION:    acpi_get_type
 *
- * PARAMETERS:  Handle          - Handle of object whose type is desired
+ * PARAMETERS:  handle          - Handle of object whose type is desired
 *              ret_type        - Where the type will be placed
 *
 * RETURN:      Status
@@ -151,7 +151,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_type)
 *
 * FUNCTION:    acpi_get_parent
 *
- * PARAMETERS:  Handle          - Handle of object whose parent is desired
+ * PARAMETERS:  handle          - Handle of object whose parent is desired
 *              ret_handle      - Where the parent handle will be placed
 *
 * RETURN:      Status
@@ -212,8 +212,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_parent)
 *
 * FUNCTION:    acpi_get_next_object
 *
- * PARAMETERS:  Type            - Type of object to be searched for
+ * PARAMETERS:  type            - Type of object to be searched for
- *              Parent          - Parent object whose children we are getting
+ *              parent          - Parent object whose children we are getting
 *              last_child      - Previous child that was found.
 *                                The NEXT child will be returned
 *              ret_handle      - Where handle to the next object is placed
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 5ac36aba507c..844464c4f901 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -210,7 +210,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
 * FUNCTION:    acpi_ps_get_next_namepath
 *
 * PARAMETERS:  parser_state        - Current parser state object
- *              Arg                 - Where the namepath will be stored
+ *              arg                 - Where the namepath will be stored
 *              arg_count           - If the namepath points to a control method
 *                                    the method's argument is returned here.
 *              possible_method_call - Whether the namepath can possibly be the
@@ -379,7 +379,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
 *
 * PARAMETERS:  parser_state        - Current parser state object
 *              arg_type            - The argument type (AML_*_ARG)
- *              Arg                 - Where the argument is returned
+ *              arg                 - Where the argument is returned
 *
 * RETURN:      None
 *
@@ -618,6 +618,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                                arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);
                                if (!arg) {
+                                        acpi_ps_free_op(field);
                                        return_PTR(NULL);
                                }
@@ -662,6 +663,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                } else {
                        arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
                        if (!arg) {
+                                acpi_ps_free_op(field);
                                return_PTR(NULL);
                        }
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 9547ad8a620b..799162c1b6df 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -167,7 +167,7 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
 * PARAMETERS:  walk_state          - Current state
 *              aml_op_start        - Begin of named Op in AML
 *              unnamed_op          - Early Op (not a named Op)
- *              Op                  - Returned Op
+ *              op                  - Returned Op
 *
 * RETURN:      Status
 *
@@ -323,7 +323,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
        if (walk_state->op_info->flags & AML_CREATE) {
                /*
-                 * Backup to beginning of create_xXXfield declaration
+                 * Backup to beginning of create_XXXfield declaration
                 * body_length is unknown until we parse the body
                 */
                op->named.data = aml_op_start;
@@ -380,7 +380,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
 *
 * PARAMETERS:  walk_state          - Current state
 *              aml_op_start        - Op start in AML
- *              Op                  - Current Op
+ *              op                  - Current Op
 *
 * RETURN:      Status
 *
@@ -679,8 +679,8 @@ acpi_ps_link_module_code(union acpi_parse_object *parent_op,
 * FUNCTION:    acpi_ps_complete_op
 *
 * PARAMETERS:  walk_state          - Current state
- *              Op                  - Returned Op
+ *              op                  - Returned Op
- *              Status              - Parse status before complete Op
+ *              status              - Parse status before complete Op
 *
 * RETURN:      Status
 *
@@ -853,8 +853,8 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
 * FUNCTION:    acpi_ps_complete_final_op
 *
 * PARAMETERS:  walk_state          - Current state
- *              Op                  - Current Op
+ *              op                  - Current Op
- *              Status              - Current parse status before complete last
+ *              status              - Current parse status before complete last
 *                                    Op
 *
 * RETURN:      Status
@@ -1165,7 +1165,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                if (walk_state->op_info->flags & AML_CREATE) {
                        /*
-                         * Backup to beginning of create_xXXfield declaration (1 for
+                         * Backup to beginning of create_XXXfield declaration (1 for
                         * Opcode)
                         *
                         * body_length is unknown until we parse the body
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index a0226fdcf75c..ed1d457bd5ca 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -724,7 +724,7 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
 *
 * FUNCTION:    acpi_ps_get_opcode_info
 *
- * PARAMETERS:  Opcode              - The AML opcode
+ * PARAMETERS:  opcode              - The AML opcode
 *
 * RETURN:      A pointer to the info about the opcode.
 *
@@ -769,7 +769,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 *
 * FUNCTION:    acpi_ps_get_opcode_name
 *
- * PARAMETERS:  Opcode              - The AML opcode
+ * PARAMETERS:  opcode              - The AML opcode
 *
 * RETURN:      A pointer to the name of the opcode (ASCII String)
 *              Note: Never returns NULL.
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 2ff9c35a1968..01985703bb98 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("psparse")
 *
 * FUNCTION:    acpi_ps_get_opcode_size
 *
- * PARAMETERS:  Opcode          - An AML opcode
+ * PARAMETERS:  opcode          - An AML opcode
 *
 * RETURN:      Size of the opcode, in bytes (1 or 2)
 *
@@ -121,7 +121,7 @@ u16 acpi_ps_peek_opcode(struct acpi_parse_state * parser_state)
 * FUNCTION:    acpi_ps_complete_this_op
 *
 * PARAMETERS:  walk_state      - Current State
- *              Op              - Op to complete
+ *              op              - Op to complete
 *
 * RETURN:      Status
 *
@@ -311,7 +311,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
 * FUNCTION:    acpi_ps_next_parse_state
 *
 * PARAMETERS:  walk_state          - Current state
- *              Op                  - Current parse op
+ *              op                  - Current parse op
 *              callback_status     - Status from previous operation
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index c872aa4b926e..608dc20dc173 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -93,7 +93,7 @@ u8 acpi_ps_has_completed_scope(struct acpi_parse_state * parser_state)
 * FUNCTION:    acpi_ps_init_scope
 *
 * PARAMETERS:  parser_state        - Current parser state object
- *              Root                - the Root Node of this new scope
+ *              root                - the Root Node of this new scope
 *
 * RETURN:      Status
 *
@@ -131,7 +131,7 @@ acpi_ps_init_scope(struct acpi_parse_state * parser_state,
 * FUNCTION:    acpi_ps_push_scope
 *
 * PARAMETERS:  parser_state        - Current parser state object
- *              Op                  - Current op to be pushed
+ *              op                  - Current op to be pushed
 *              remaining_args      - List of args remaining
 *              arg_count           - Fixed or variable number of args
 *
@@ -184,7 +184,7 @@ acpi_ps_push_scope(struct acpi_parse_state *parser_state,
 * FUNCTION:    acpi_ps_pop_scope
 *
 * PARAMETERS:  parser_state        - Current parser state object
- *              Op                  - Where the popped op is returned
+ *              op                  - Where the popped op is returned
 *              arg_list            - Where the popped "next argument" is
 *                                    returned
 *              arg_count           - Count of objects in arg_list
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index 2b03cdbbe1c0..fdb2e71f3046 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -58,8 +58,8 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op);
 *
 * FUNCTION:    acpi_ps_get_arg
 *
- * PARAMETERS:  Op              - Get an argument for this op
+ * PARAMETERS:  op              - Get an argument for this op
- *              Argn            - Nth argument to get
+ *              argn            - Nth argument to get
 *
 * RETURN:      The argument (as an Op object). NULL if argument does not exist
 *
@@ -114,8 +114,8 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)
 *
 * FUNCTION:    acpi_ps_append_arg
 *
- * PARAMETERS:  Op              - Append an argument to this Op.
+ * PARAMETERS:  op              - Append an argument to this Op.
- *              Arg             - Argument Op to append
+ *              arg             - Argument Op to append
 *
 * RETURN:      None.
 *
@@ -188,8 +188,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
 *
 * FUNCTION:    acpi_ps_get_depth_next
 *
- * PARAMETERS:  Origin          - Root of subtree to search
+ * PARAMETERS:  origin          - Root of subtree to search
- *              Op              - Last (previous) Op that was found
+ *              op              - Last (previous) Op that was found
 *
 * RETURN:      Next Op found in the search.
 *
@@ -261,7 +261,7 @@ union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,
 *
 * FUNCTION:    acpi_ps_get_child
 *
- * PARAMETERS:  Op              - Get the child of this Op
+ * PARAMETERS:  op              - Get the child of this Op
 *
 * RETURN:      Child Op, Null if none is found.
 *
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 13bb131ae125..8736ad5f04d3 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -77,8 +77,8 @@ union acpi_parse_object *acpi_ps_create_scope_op(void)
 *
 * FUNCTION:    acpi_ps_init_op
 *
- * PARAMETERS:  Op              - A newly allocated Op object
+ * PARAMETERS:  op              - A newly allocated Op object
- *              Opcode          - Opcode to store in the Op
+ *              opcode          - Opcode to store in the Op
 *
 * RETURN:      None
 *
@@ -103,7 +103,7 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
 *
 * FUNCTION:    acpi_ps_alloc_op
 *
- * PARAMETERS:  Opcode          - Opcode that will be stored in the new Op
+ * PARAMETERS:  opcode          - Opcode that will be stored in the new Op
 *
 * RETURN:      Pointer to the new Op, null on failure
 *
@@ -160,7 +160,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
 *
 * FUNCTION:    acpi_ps_free_op
 *
- * PARAMETERS:  Op              - Op to be freed
+ * PARAMETERS:  op              - Op to be freed
 *
 * RETURN:      None.
 *
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 9d98c5ff66a5..963e16225797 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -66,7 +66,7 @@ acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action);
 * PARAMETERS:  method_name     - Valid ACPI name string
 *              debug_level     - Optional level mask. 0 to use default
 *              debug_layer     - Optional layer mask. 0 to use default
- *              Flags           - bit 1: one shot(1) or persistent(0)
+ *              flags           - bit 1: one shot(1) or persistent(0)
 *
 * RETURN:      Status
 *
@@ -105,7 +105,7 @@ acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags)
 *
 * FUNCTION:    acpi_ps_start_trace
 *
- * PARAMETERS:  Info        - Method info struct
+ * PARAMETERS:  info        - Method info struct
 *
 * RETURN:      None
 *
@@ -150,7 +150,7 @@ static void acpi_ps_start_trace(struct acpi_evaluate_info *info)
 *
 * FUNCTION:    acpi_ps_stop_trace
 *
- * PARAMETERS:  Info        - Method info struct
+ * PARAMETERS:  info        - Method info struct
 *
 * RETURN:      None
 *
@@ -193,10 +193,10 @@ static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)
 *
 * FUNCTION:    acpi_ps_execute_method
 *
- * PARAMETERS:  Info            - Method info block, contains:
+ * PARAMETERS:  info            - Method info block, contains:
- *                  Node            - Method Node to execute
+ *                  node            - Method Node to execute
 *                  obj_desc        - Method object
- *                  Parameters      - List of parameters to pass to the method,
+ *                  parameters      - List of parameters to pass to the method,
 *                                    terminated by NULL. Params itself may be
 *                                    NULL if no parameters are being passed.
 *                  return_object   - Where to put method's return value (if
@@ -361,9 +361,9 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
 *
 * FUNCTION:    acpi_ps_update_parameter_list
 *
- * PARAMETERS:  Info            - See struct acpi_evaluate_info
+ * PARAMETERS:  info            - See struct acpi_evaluate_info
 *                                (Used: parameter_type and Parameters)
- *              Action          - Add or Remove reference
+ *              action          - Add or Remove reference
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index a0305652394f..856ff075b6ab 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -182,8 +182,8 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_address64[5] = {
        /* Revision ID */
-        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.ext_address64.revision_iD),
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.ext_address64.revision_ID),
-         AML_OFFSET(ext_address64.revision_iD),
+         AML_OFFSET(ext_address64.revision_ID),
         1},
        /*
         * These fields are contiguous in both the source and destination:
@@ -215,7 +215,7 @@ static struct acpi_rsconvert_info acpi_rs_convert_general_flags[6] = {
         AML_OFFSET(address.resource_type),
         1},
-        /* General Flags - Consume, Decode, min_fixed, max_fixed */
+        /* General flags - Consume, Decode, min_fixed, max_fixed */
        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.producer_consumer),
         AML_OFFSET(address.flags),
@@ -293,8 +293,8 @@ static struct acpi_rsconvert_info acpi_rs_convert_io_flags[4] = {
 *
 * FUNCTION:    acpi_rs_get_address_common
 *
- * PARAMETERS:  Resource            - Pointer to the internal resource struct
+ * PARAMETERS:  resource            - Pointer to the internal resource struct
- *              Aml                 - Pointer to the AML resource descriptor
+ *              aml                 - Pointer to the AML resource descriptor
 *
 * RETURN:      TRUE if the resource_type field is OK, FALSE otherwise
 *
@@ -343,8 +343,8 @@ acpi_rs_get_address_common(struct acpi_resource *resource,
 *
 * FUNCTION:    acpi_rs_set_address_common
 *
- * PARAMETERS:  Aml                 - Pointer to the AML resource descriptor
+ * PARAMETERS:  aml                 - Pointer to the AML resource descriptor
- *              Resource            - Pointer to the internal resource struct
+ *              resource            - Pointer to the internal resource struct
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 3c6df4b7eb2d..de12469d1c9c 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -173,7 +173,7 @@ acpi_rs_stream_option_length(u32 resource_length,
 *
 * FUNCTION:    acpi_rs_get_aml_length
 *
- * PARAMETERS:  Resource            - Pointer to the resource linked list
+ * PARAMETERS:  resource            - Pointer to the resource linked list
 *              size_needed         - Where the required size is returned
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 46d6eb38ae66..311cbc4f05fa 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -190,8 +190,8 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
 *
 * FUNCTION:    acpi_rs_create_pci_routing_table
 *
- * PARAMETERS:  package_object          - Pointer to a union acpi_operand_object
+ * PARAMETERS:  package_object          - Pointer to a package containing one
- *                                        package
+ *                                        of more ACPI_OPERAND_OBJECTs
 *              output_buffer           - Pointer to the user's buffer
 *
 * RETURN:      Status  AE_OK if okay, else a valid acpi_status code.
@@ -199,7 +199,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
 *              AE_BUFFER_OVERFLOW and output_buffer->Length will point
 *              to the size buffer needed.
 *
- * DESCRIPTION: Takes the union acpi_operand_object    package and creates a
+ * DESCRIPTION: Takes the union acpi_operand_object package and creates a
 *              linked list of PCI interrupt descriptions
 *
 * NOTE: It is the caller's responsibility to ensure that the start of the
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index b4c581132393..4d11b072388c 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -703,7 +703,7 @@ acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source)
 *
 * FUNCTION:    acpi_rs_dump_address_common
 *
- * PARAMETERS:  Resource        - Pointer to an internal resource descriptor
+ * PARAMETERS:  resource        - Pointer to an internal resource descriptor
 *
 * RETURN:      None
 *
@@ -850,8 +850,8 @@ void acpi_rs_dump_irq_list(u8 * route_table)
 *
 * FUNCTION:    acpi_rs_out*
 *
- * PARAMETERS:  Title       - Name of the resource field
+ * PARAMETERS:  title       - Name of the resource field
- *              Value       - Value of the resource field
+ *              value       - Value of the resource field
 *
 * RETURN:      None
 *
@@ -898,8 +898,8 @@ static void acpi_rs_out_title(char *title)
 *
 * FUNCTION:    acpi_rs_dump*List
 *
- * PARAMETERS:  Length      - Number of elements in the list
+ * PARAMETERS:  length      - Number of elements in the list
- *              Data        - Start of the list
+ *              data        - Start of the list
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 9be129f5d6f4..46b5324b22d6 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -139,7 +139,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
 *
 * FUNCTION:    acpi_rs_convert_resources_to_aml
 *
- * PARAMETERS:  Resource            - Pointer to the resource linked list
+ * PARAMETERS:  resource            - Pointer to the resource linked list
 *              aml_size_needed     - Calculated size of the byte stream
 *                                    needed from calling acpi_rs_get_aml_length()
 *                                    The size of the output_buffer is
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 8073b371cc7c..c6f291c2bc83 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -57,9 +57,9 @@ ACPI_MODULE_NAME("rsmisc")
 *
 * FUNCTION:    acpi_rs_convert_aml_to_resource
 *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  resource            - Pointer to the resource descriptor
- *              Aml                 - Where the AML descriptor is returned
+ *              aml                 - Where the AML descriptor is returned
- *              Info                - Pointer to appropriate conversion table
+ *              info                - Pointer to appropriate conversion table
 *
 * RETURN:      Status
 *
@@ -406,7 +406,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                case ACPI_RSC_EXIT_NE:
                        /*
-                         * Control - Exit conversion if not equal
+                         * control - Exit conversion if not equal
                         */
                        switch (info->resource_offset) {
                        case ACPI_RSC_COMPARE_AML_LENGTH:
@@ -454,9 +454,9 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 *
 * FUNCTION:    acpi_rs_convert_resource_to_aml
 *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  resource            - Pointer to the resource descriptor
- *              Aml                 - Where the AML descriptor is returned
+ *              aml                 - Where the AML descriptor is returned
- *              Info                - Pointer to appropriate conversion table
+ *              info                - Pointer to appropriate conversion table
 *
 * RETURN:      Status
 *
@@ -726,7 +726,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                case ACPI_RSC_EXIT_LE:
                        /*
-                         * Control - Exit conversion if less than or equal
+                         * control - Exit conversion if less than or equal
                         */
                        if (item_count <= info->value) {
                                goto exit;
@@ -735,7 +735,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                case ACPI_RSC_EXIT_NE:
                        /*
-                         * Control - Exit conversion if not equal
+                         * control - Exit conversion if not equal
                         */
                        switch (COMPARE_OPCODE(info)) {
                        case ACPI_RSC_COMPARE_VALUE:
@@ -757,7 +757,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                case ACPI_RSC_EXIT_EQ:
                        /*
-                         * Control - Exit conversion if equal
+                         * control - Exit conversion if equal
                         */
                        if (*ACPI_ADD_PTR(u8, resource,
                                          COMPARE_TARGET(info)) ==
@@ -783,7 +783,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
 #if 0
 /* Previous resource validations */
-if (aml->ext_address64.revision_iD != AML_RESOURCE_EXTENDED_ADDRESS_REVISION) {
+if (aml->ext_address64.revision_ID != AML_RESOURCE_EXTENDED_ADDRESS_REVISION) {
        return_ACPI_STATUS(AE_SUPPORT);
 }
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 433a375deb93..37d5241c0acf 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("rsutils")
 *
 * FUNCTION:    acpi_rs_decode_bitmask
 *
- * PARAMETERS:  Mask            - Bitmask to decode
+ * PARAMETERS:  mask            - Bitmask to decode
- *              List            - Where the converted list is returned
+ *              list            - Where the converted list is returned
 *
 * RETURN:      Count of bits set (length of list)
 *
@@ -86,8 +86,8 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 *
 * FUNCTION:    acpi_rs_encode_bitmask
 *
- * PARAMETERS:  List            - List of values to encode
+ * PARAMETERS:  list            - List of values to encode
- *              Count           - Length of list
+ *              count           - Length of list
 *
 * RETURN:      Encoded bitmask
 *
@@ -115,8 +115,8 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 *
 * FUNCTION:    acpi_rs_move_data
 *
- * PARAMETERS:  Destination         - Pointer to the destination descriptor
+ * PARAMETERS:  destination         - Pointer to the destination descriptor
- *              Source              - Pointer to the source descriptor
+ *              source              - Pointer to the source descriptor
 *              item_count          - How many items to move
 *              move_type           - Byte width
 *
@@ -183,7 +183,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
 *
 * PARAMETERS:  total_length        - Length of the AML descriptor, including
 *                                    the header and length fields.
- *              Aml                 - Pointer to the raw AML descriptor
+ *              aml                 - Pointer to the raw AML descriptor
 *
 * RETURN:      None
 *
@@ -235,7 +235,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
 * PARAMETERS:  descriptor_type     - Byte to be inserted as the type
 *              total_length        - Length of the AML descriptor, including
 *                                    the header and length fields.
- *              Aml                 - Pointer to the raw AML descriptor
+ *              aml                 - Pointer to the raw AML descriptor
 *
 * RETURN:      None
 *
@@ -265,8 +265,8 @@ acpi_rs_set_resource_header(u8 descriptor_type,
 *
 * FUNCTION:    acpi_rs_strcpy
 *
- * PARAMETERS:  Destination         - Pointer to the destination string
+ * PARAMETERS:  destination         - Pointer to the destination string
- *              Source              - Pointer to the source string
+ *              source              - Pointer to the source string
 *
 * RETURN:      String length, including NULL terminator
 *
@@ -300,7 +300,7 @@ static u16 acpi_rs_strcpy(char *destination, char *source)
 *              minimum_length      - Minimum length of the descriptor (minus
 *                                    any optional fields)
 *              resource_source     - Where the resource_source is returned
- *              Aml                 - Pointer to the raw AML descriptor
+ *              aml                 - Pointer to the raw AML descriptor
 *              string_ptr          - (optional) where to store the actual
 *                                    resource_source string
 *
@@ -386,7 +386,7 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
 *
 * FUNCTION:    acpi_rs_set_resource_source
 *
- * PARAMETERS:  Aml                 - Pointer to the raw AML descriptor
+ * PARAMETERS:  aml                 - Pointer to the raw AML descriptor
 *              minimum_length      - Minimum length of the descriptor (minus
 *                                    any optional fields)
 *              resource_source     - Internal resource_source
@@ -445,7 +445,7 @@ acpi_rs_set_resource_source(union aml_resource * aml,
 *
 * FUNCTION:    acpi_rs_get_prt_method_data
 *
- * PARAMETERS:  Node            - Device node
+ * PARAMETERS:  node            - Device node
 *              ret_buffer      - Pointer to a buffer structure for the
 *                                results
 *
@@ -494,7 +494,7 @@ acpi_rs_get_prt_method_data(struct acpi_namespace_node * node,
 *
 * FUNCTION:    acpi_rs_get_crs_method_data
 *
- * PARAMETERS:  Node            - Device node
+ * PARAMETERS:  node            - Device node
 *              ret_buffer      - Pointer to a buffer structure for the
 *                                results
 *
@@ -534,7 +534,7 @@ acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
         */
        status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
-        /* On exit, we must delete the object returned by evaluate_object */
+        /* On exit, we must delete the object returned by evaluateObject */
        acpi_ut_remove_reference(obj_desc);
        return_ACPI_STATUS(status);
@@ -544,7 +544,7 @@ acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_rs_get_prs_method_data
 *
- * PARAMETERS:  Node            - Device node
+ * PARAMETERS:  node            - Device node
 *              ret_buffer      - Pointer to a buffer structure for the
 *                                results
 *
@@ -585,7 +585,7 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
         */
        status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
-        /* On exit, we must delete the object returned by evaluate_object */
+        /* On exit, we must delete the object returned by evaluateObject */
        acpi_ut_remove_reference(obj_desc);
        return_ACPI_STATUS(status);
@@ -596,7 +596,7 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_rs_get_aei_method_data
 *
- * PARAMETERS:  Node            - Device node
+ * PARAMETERS:  node            - Device node
 *              ret_buffer      - Pointer to a buffer structure for the
 *                                results
 *
@@ -636,7 +636,7 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
         */
        status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
-        /* On exit, we must delete the object returned by evaluate_object */
+        /* On exit, we must delete the object returned by evaluateObject */
        acpi_ut_remove_reference(obj_desc);
        return_ACPI_STATUS(status);
@@ -646,8 +646,8 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
 *
 * FUNCTION:    acpi_rs_get_method_data
 *
- * PARAMETERS:  Handle          - Handle to the containing object
+ * PARAMETERS:  handle          - Handle to the containing object
- *              Path            - Path to method, relative to Handle
+ *              path            - Path to method, relative to Handle
 *              ret_buffer      - Pointer to a buffer structure for the
 *                                results
 *
@@ -697,7 +697,7 @@ acpi_rs_get_method_data(acpi_handle handle,
 *
 * FUNCTION:    acpi_rs_set_srs_method_data
 *
- * PARAMETERS:  Node            - Device node
+ * PARAMETERS:  node            - Device node
 *              in_buffer       - Pointer to a buffer structure of the
 *                                parameter
 *
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index f58c098c7aeb..5aad744b5b83 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -79,7 +79,7 @@ acpi_rs_validate_parameters(acpi_handle device_handle,
 * FUNCTION:    acpi_rs_validate_parameters
 *
 * PARAMETERS:  device_handle   - Handle to a device
- *              Buffer          - Pointer to a data buffer
+ *              buffer          - Pointer to a data buffer
 *              return_node     - Pointer to where the device node is returned
 *
 * RETURN:      Status
@@ -351,8 +351,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_event_resources)
 *
 * FUNCTION:    acpi_resource_to_address64
 *
- * PARAMETERS:  Resource        - Pointer to a resource
+ * PARAMETERS:  resource        - Pointer to a resource
- *              Out             - Pointer to the users's return buffer
+ *              out             - Pointer to the users's return buffer
 *                                (a struct acpi_resource_address64)
 *
 * RETURN:      Status
@@ -415,9 +415,9 @@ ACPI_EXPORT_SYMBOL(acpi_resource_to_address64)
 * FUNCTION:    acpi_get_vendor_resource
 *
 * PARAMETERS:  device_handle   - Handle for the parent device object
- *              Name            - Method name for the parent resource
+ *              name            - Method name for the parent resource
 *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)
- *              Uuid            - Pointer to the UUID to be matched.
+ *              uuid            - Pointer to the UUID to be matched.
 *                                includes both subtype and 16-byte UUID
 *              ret_buffer      - Where the vendor resource is returned
 *
@@ -526,11 +526,11 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
 *
 * PARAMETERS:  device_handle   - Handle to the device object for the
 *                                device we are querying
- *              Name            - Method name of the resources we want.
+ *              name            - Method name of the resources we want.
 *                                (METHOD_NAME__CRS, METHOD_NAME__PRS, or
 *                                METHOD_NAME__AEI)
 *              user_function   - Called for each resource
- *              Context         - Passed to user_function
+ *              context         - Passed to user_function
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 4c9c760db4a4..390651860bf0 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -49,9 +49,10 @@
 ACPI_MODULE_NAME("tbfadt")
 /* Local prototypes */
-static ACPI_INLINE void
+static void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 space_id, u8 byte_width, u64 address);
+                             u8 space_id,
+                             u8 byte_width, u64 address, char *register_name);
 static void acpi_tb_convert_fadt(void);
@@ -172,7 +173,7 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
 *
 * PARAMETERS:  generic_address     - GAS struct to be initialized
 *              byte_width          - Width of this register
- *              Address             - Address of the register
+ *              address             - Address of the register
 *
 * RETURN:      None
 *
@@ -182,10 +183,25 @@ static struct acpi_fadt_pm_info fadt_pm_info_table[] = {
 *
 ******************************************************************************/
-static ACPI_INLINE void
+static void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 space_id, u8 byte_width, u64 address)
+                             u8 space_id,
+                             u8 byte_width, u64 address, char *register_name)
 {
+        u8 bit_width;
+        /* Bit width field in the GAS is only one byte long, 255 max */
+        bit_width = (u8)(byte_width * 8);
+        if (byte_width > 31) {  /* (31*8)=248 */
+                ACPI_ERROR((AE_INFO,
+                            "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
+                            "to convert to GAS struct - 255 bits max, truncating",
+                            register_name, byte_width, (byte_width * 8)));
+                bit_width = 255;
+        }
        /*
         * The 64-bit Address field is non-aligned in the byte packed
@@ -196,7 +212,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
        /* All other fields are byte-wide */
        generic_address->space_id = space_id;
-        generic_address->bit_width = (u8)ACPI_MUL_8(byte_width);
+        generic_address->bit_width = bit_width;
        generic_address->bit_offset = 0;
        generic_address->access_width = 0;      /* Access width ANY */
 }
@@ -267,8 +283,8 @@ void acpi_tb_parse_fadt(u32 table_index)
 *
 * FUNCTION:    acpi_tb_create_local_fadt
 *
- * PARAMETERS:  Table               - Pointer to BIOS FADT
+ * PARAMETERS:  table               - Pointer to BIOS FADT
- *              Length              - Length of the table
+ *              length              - Length of the table
 *
 * RETURN:      None
 *
@@ -287,11 +303,11 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
         * a warning.
         */
        if (length > sizeof(struct acpi_table_fadt)) {
-                ACPI_WARNING((AE_INFO,
+                ACPI_BIOS_WARNING((AE_INFO,
-                              "FADT (revision %u) is longer than ACPI 5.0 version, "
+                                   "FADT (revision %u) is longer than ACPI 5.0 version, "
-                              "truncating length %u to %u",
+                                   "truncating length %u to %u",
-                              table->revision, length,
+                                   table->revision, length,
-                              (u32)sizeof(struct acpi_table_fadt)));
+                                   (u32)sizeof(struct acpi_table_fadt)));
        }
        /* Clear the entire local FADT */
@@ -436,11 +452,13 @@ static void acpi_tb_convert_fadt(void)
                 * they must match.
                 */
                if (address64->address && address32 &&
-                    (address64->address != (u64) address32)) {
+                    (address64->address != (u64)address32)) {
-                        ACPI_ERROR((AE_INFO,
+                        ACPI_BIOS_ERROR((AE_INFO,
-                                    "32/64X address mismatch in %s: 0x%8.8X/0x%8.8X%8.8X, using 32",
+                                         "32/64X address mismatch in FADT/%s: "
-                                    fadt_info_table[i].name, address32,
+                                         "0x%8.8X/0x%8.8X%8.8X, using 32",
-                                    ACPI_FORMAT_UINT64(address64->address)));
+                                         fadt_info_table[i].name, address32,
+                                         ACPI_FORMAT_UINT64(address64->
+                                                            address)));
                }
                /* Always use 32-bit address if it is valid (non-null) */
@@ -456,7 +474,8 @@ static void acpi_tb_convert_fadt(void)
                                                                   &acpi_gbl_FADT,
                                                                   fadt_info_table
                                                                   [i].length),
-                                                     (u64) address32);
+                                                     (u64) address32,
+                                                     fadt_info_table[i].name);
                }
        }
 }
@@ -465,7 +484,7 @@ static void acpi_tb_convert_fadt(void)
 *
 * FUNCTION:    acpi_tb_validate_fadt
 *
- * PARAMETERS:  Table           - Pointer to the FADT to be validated
+ * PARAMETERS:  table           - Pointer to the FADT to be validated
 *
 * RETURN:      None
 *
@@ -494,25 +513,25 @@ static void acpi_tb_validate_fadt(void)
         * DSDT/X_DSDT) would indicate the presence of two FACS or two DSDT tables.
         */
        if (acpi_gbl_FADT.facs &&
-            (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
+            (acpi_gbl_FADT.Xfacs != (u64)acpi_gbl_FADT.facs)) {
-                ACPI_WARNING((AE_INFO,
+                ACPI_BIOS_WARNING((AE_INFO,
-                              "32/64X FACS address mismatch in FADT - "
+                                   "32/64X FACS address mismatch in FADT - "
-                              "0x%8.8X/0x%8.8X%8.8X, using 32",
+                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                              acpi_gbl_FADT.facs,
+                                   acpi_gbl_FADT.facs,
-                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
+                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
-                acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
+                acpi_gbl_FADT.Xfacs = (u64)acpi_gbl_FADT.facs;
        }
        if (acpi_gbl_FADT.dsdt &&
-            (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
+            (acpi_gbl_FADT.Xdsdt != (u64)acpi_gbl_FADT.dsdt)) {
-                ACPI_WARNING((AE_INFO,
+                ACPI_BIOS_WARNING((AE_INFO,
-                              "32/64X DSDT address mismatch in FADT - "
+                                   "32/64X DSDT address mismatch in FADT - "
-                              "0x%8.8X/0x%8.8X%8.8X, using 32",
+                                   "0x%8.8X/0x%8.8X%8.8X, using 32",
-                              acpi_gbl_FADT.dsdt,
+                                   acpi_gbl_FADT.dsdt,
-                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
+                                   ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
-                acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
+                acpi_gbl_FADT.Xdsdt = (u64)acpi_gbl_FADT.dsdt;
        }
        /* If Hardware Reduced flag is set, we are all done */
@@ -542,10 +561,10 @@ static void acpi_tb_validate_fadt(void)
                 */
                if (address64->address &&
                    (address64->bit_width != ACPI_MUL_8(length))) {
-                        ACPI_WARNING((AE_INFO,
+                        ACPI_BIOS_WARNING((AE_INFO,
-                                      "32/64X length mismatch in %s: %u/%u",
+                                           "32/64X length mismatch in FADT/%s: %u/%u",
-                                      name, ACPI_MUL_8(length),
+                                           name, ACPI_MUL_8(length),
-                                      address64->bit_width));
+                                           address64->bit_width));
                }
                if (fadt_info_table[i].type & ACPI_FADT_REQUIRED) {
@@ -554,29 +573,29 @@ static void acpi_tb_validate_fadt(void)
                         * Both the address and length must be non-zero.
                         */
                        if (!address64->address || !length) {
-                                ACPI_ERROR((AE_INFO,
+                                ACPI_BIOS_ERROR((AE_INFO,
-                                            "Required field %s has zero address and/or length:"
+                                                 "Required FADT field %s has zero address and/or length: "
-                                            " 0x%8.8X%8.8X/0x%X",
+                                                 "0x%8.8X%8.8X/0x%X",
-                                            name,
+                                                 name,
-                                            ACPI_FORMAT_UINT64(address64->
+                                                 ACPI_FORMAT_UINT64(address64->
-                                                               address),
+                                                                    address),
-                                            length));
+                                                 length));
                        }
                } else if (fadt_info_table[i].type & ACPI_FADT_SEPARATE_LENGTH) {
                        /*
-                         * Field is optional (PM2Control, GPE0, GPE1) AND has its own
+                         * Field is optional (Pm2_control, GPE0, GPE1) AND has its own
                         * length field. If present, both the address and length must
                         * be valid.
                         */
                        if ((address64->address && !length) ||
                            (!address64->address && length)) {
-                                ACPI_WARNING((AE_INFO,
+                                ACPI_BIOS_WARNING((AE_INFO,
-                                              "Optional field %s has zero address or length: "
+                                                   "Optional FADT field %s has zero address or length: "
-                                              "0x%8.8X%8.8X/0x%X",
+                                                   "0x%8.8X%8.8X/0x%X",
-                                              name,
+                                                   name,
-                                              ACPI_FORMAT_UINT64(address64->
+                                                   ACPI_FORMAT_UINT64
-                                                                 address),
+                                                   (address64->address),
-                                              length));
+                                                   length));
                        }
                }
        }
@@ -621,12 +640,12 @@ static void acpi_tb_setup_fadt_registers(void)
                            (fadt_info_table[i].default_length > 0) &&
                            (fadt_info_table[i].default_length !=
                             target64->bit_width)) {
-                                ACPI_WARNING((AE_INFO,
+                                ACPI_BIOS_WARNING((AE_INFO,
-                                              "Invalid length for %s: %u, using default %u",
+                                                   "Invalid length for FADT/%s: %u, using default %u",
-                                              fadt_info_table[i].name,
+                                                   fadt_info_table[i].name,
-                                              target64->bit_width,
+                                                   target64->bit_width,
-                                              fadt_info_table[i].
+                                                   fadt_info_table[i].
-                                              default_length));
+                                                   default_length));
                                /* Incorrect size, set width to the default */
@@ -670,7 +689,8 @@ static void acpi_tb_setup_fadt_registers(void)
                                                     source64->address +
                                                     (fadt_pm_info_table[i].
                                                      register_num *
-                                                      pm1_register_byte_width));
+                                                      pm1_register_byte_width),
+                                                     "PmRegisters");
                }
        }
 }
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 4903e36ea75a..57deae166577 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("tbfind")
 *
 * FUNCTION:    acpi_tb_find_table
 *
- * PARAMETERS:  Signature           - String with ACPI table signature
+ * PARAMETERS:  signature           - String with ACPI table signature
 *              oem_id              - String with the table OEM ID
 *              oem_table_id        - String with the OEM Table ID
 *              table_index         - Where the table index is returned
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index c03500b4cc7a..74f97d74db1c 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -138,13 +138,14 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
        if ((table_desc->pointer->signature[0] != 0x00) &&
            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
            && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
-                ACPI_ERROR((AE_INFO,
+                ACPI_BIOS_ERROR((AE_INFO,
-                            "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
+                                 "Table has invalid signature [%4.4s] (0x%8.8X), "
-                            acpi_ut_valid_acpi_name(*(u32 *)table_desc->
+                                 "must be SSDT or OEMx",
-                                                    pointer->
+                                 acpi_ut_valid_acpi_name(*(u32 *)table_desc->
-                                                    signature) ? table_desc->
+                                                         pointer->
-                            pointer->signature : "????",
+                                                         signature) ?
-                            *(u32 *)table_desc->pointer->signature));
+                                 table_desc->pointer->signature : "????",
+                                 *(u32 *)table_desc->pointer->signature));
                return_ACPI_STATUS(AE_BAD_SIGNATURE);
        }
@@ -396,10 +397,10 @@ acpi_status acpi_tb_resize_root_table_list(void)
 *
 * FUNCTION:    acpi_tb_store_table
 *
- * PARAMETERS:  Address             - Table address
+ * PARAMETERS:  address             - Table address
- *              Table               - Table header
+ *              table               - Table header
- *              Length              - Table length
+ *              length              - Table length
- *              Flags               - flags
+ *              flags               - flags
 *
 * RETURN:      Status and table index.
 *
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 0a706cac37de..b6cea30da638 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -178,8 +178,8 @@ u8 acpi_tb_tables_loaded(void)
 *
 * FUNCTION:    acpi_tb_fix_string
 *
- * PARAMETERS:  String              - String to be repaired
+ * PARAMETERS:  string              - String to be repaired
- *              Length              - Maximum length
+ *              length              - Maximum length
 *
 * RETURN:      None
 *
@@ -205,7 +205,7 @@ static void acpi_tb_fix_string(char *string, acpi_size length)
 * FUNCTION:    acpi_tb_cleanup_table_header
 *
 * PARAMETERS:  out_header          - Where the cleaned header is returned
- *              Header              - Input ACPI table header
+ *              header              - Input ACPI table header
 *
 * RETURN:      Returns the cleaned header in out_header
 *
@@ -231,8 +231,8 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
 *
 * FUNCTION:    acpi_tb_print_table_header
 *
- * PARAMETERS:  Address             - Table physical address
+ * PARAMETERS:  address             - Table physical address
- *              Header              - Table header
+ *              header              - Table header
 *
 * RETURN:      None
 *
@@ -296,8 +296,8 @@ acpi_tb_print_table_header(acpi_physical_address address,
 *
 * FUNCTION:    acpi_tb_validate_checksum
 *
- * PARAMETERS:  Table               - ACPI table to verify
+ * PARAMETERS:  table               - ACPI table to verify
- *              Length              - Length of entire table
+ *              length              - Length of entire table
 *
 * RETURN:      Status
 *
@@ -317,10 +317,11 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
        /* Checksum ok? (should be zero) */
        if (checksum) {
-                ACPI_WARNING((AE_INFO,
+                ACPI_BIOS_WARNING((AE_INFO,
-                              "Incorrect checksum in table [%4.4s] - 0x%2.2X, should be 0x%2.2X",
+                                   "Incorrect checksum in table [%4.4s] - 0x%2.2X, "
-                              table->signature, table->checksum,
+                                   "should be 0x%2.2X",
-                              (u8) (table->checksum - checksum)));
+                                   table->signature, table->checksum,
+                                   (u8)(table->checksum - checksum)));
 #if (ACPI_CHECKSUM_ABORT)
@@ -335,8 +336,8 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 *
 * FUNCTION:    acpi_tb_checksum
 *
- * PARAMETERS:  Buffer          - Pointer to memory region to be checked
+ * PARAMETERS:  buffer          - Pointer to memory region to be checked
- *              Length          - Length of this memory region
+ *              length          - Length of this memory region
 *
 * RETURN:      Checksum (u8)
 *
@@ -377,8 +378,9 @@ void acpi_tb_check_dsdt_header(void)
        if (acpi_gbl_original_dsdt_header.length != acpi_gbl_DSDT->length ||
            acpi_gbl_original_dsdt_header.checksum != acpi_gbl_DSDT->checksum) {
-                ACPI_ERROR((AE_INFO,
+                ACPI_BIOS_ERROR((AE_INFO,
-                            "The DSDT has been corrupted or replaced - old, new headers below"));
+                                 "The DSDT has been corrupted or replaced - "
+                                 "old, new headers below"));
                acpi_tb_print_table_header(0, &acpi_gbl_original_dsdt_header);
                acpi_tb_print_table_header(0, acpi_gbl_DSDT);
@@ -438,8 +440,8 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
 *
 * FUNCTION:    acpi_tb_install_table
 *
- * PARAMETERS:  Address                 - Physical address of DSDT or FACS
+ * PARAMETERS:  address                 - Physical address of DSDT or FACS
- *              Signature               - Table signature, NULL if no need to
+ *              signature               - Table signature, NULL if no need to
 *                                        match
 *              table_index             - Index into root table array
 *
@@ -480,9 +482,10 @@ acpi_tb_install_table(acpi_physical_address address,
        /* If a particular signature is expected (DSDT/FACS), it must match */
        if (signature && !ACPI_COMPARE_NAME(table->signature, signature)) {
-                ACPI_ERROR((AE_INFO,
+                ACPI_BIOS_ERROR((AE_INFO,
-                            "Invalid signature 0x%X for ACPI table, expected [%s]",
+                                 "Invalid signature 0x%X for ACPI table, expected [%s]",
-                            *ACPI_CAST_PTR(u32, table->signature), signature));
+                                 *ACPI_CAST_PTR(u32, table->signature),
+                                 signature));
                goto unmap_and_exit;
        }
@@ -589,10 +592,10 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
                        /* Will truncate 64-bit address to 32 bits, issue warning */
-                        ACPI_WARNING((AE_INFO,
+                        ACPI_BIOS_WARNING((AE_INFO,
-                                      "64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
+                                           "64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
-                                      " truncating",
+                                           " truncating",
-                                      ACPI_FORMAT_UINT64(address64)));
+                                           ACPI_FORMAT_UINT64(address64)));
                }
 #endif
                return ((acpi_physical_address) (address64));
@@ -603,7 +606,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
 *
 * FUNCTION:    acpi_tb_parse_root_table
 *
- * PARAMETERS:  Rsdp                    - Pointer to the RSDP
+ * PARAMETERS:  rsdp                    - Pointer to the RSDP
 *
 * RETURN:      Status
 *
@@ -694,8 +697,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
        if (length < sizeof(struct acpi_table_header)) {
-                ACPI_ERROR((AE_INFO, "Invalid length 0x%X in RSDT/XSDT",
+                ACPI_BIOS_ERROR((AE_INFO,
-                            length));
+                                 "Invalid table length 0x%X in RSDT/XSDT",
+                                 length));
                return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
        }
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index abcc6412c244..ea4c6d52605a 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -1,7 +1,6 @@
 /******************************************************************************
 *
- * Module Name: tbxface - Public interfaces to the ACPI subsystem
+ * Module Name: tbxface - ACPI table oriented external interfaces
- *                         ACPI table oriented interfaces
 *
 *****************************************************************************/
@@ -51,11 +50,6 @@
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxface")
-/* Local prototypes */
-static acpi_status acpi_tb_load_namespace(void);
-static int no_auto_ssdt;
 /*******************************************************************************
 *
 * FUNCTION:    acpi_allocate_root_table
@@ -65,11 +59,10 @@ static int no_auto_ssdt;
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Allocate a root table array. Used by i_aSL compiler and
+ * DESCRIPTION: Allocate a root table array. Used by iASL compiler and
 *              acpi_initialize_tables.
 *
 ******************************************************************************/
 acpi_status acpi_allocate_root_table(u32 initial_table_count)
 {
@@ -222,52 +215,10 @@ acpi_status acpi_reallocate_root_table(void)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_load_table
- *
- * PARAMETERS:  table_ptr       - pointer to a buffer containing the entire
- *                                table to be loaded
- *
- * RETURN:      Status
- *
- * DESCRIPTION: This function is called to load a table from the caller's
- *              buffer. The buffer must contain an entire ACPI Table including
- *              a valid header. The header fields will be verified, and if it
- *              is determined that the table is invalid, the call will fail.
- *
- ******************************************************************************/
-acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
-{
-        acpi_status status;
-        u32 table_index;
-        struct acpi_table_desc table_desc;
-        if (!table_ptr)
-                return AE_BAD_PARAMETER;
-        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
-        table_desc.pointer = table_ptr;
-        table_desc.length = table_ptr->length;
-        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
-        /*
-         * Install the new table into the local data structures
-         */
-        status = acpi_tb_add_table(&table_desc, &table_index);
-        if (ACPI_FAILURE(status)) {
-                return status;
-        }
-        status = acpi_ns_load_table(table_index, acpi_gbl_root_node);
-        return status;
-}
-ACPI_EXPORT_SYMBOL(acpi_load_table)
-/*******************************************************************************
- *
 * FUNCTION:    acpi_get_table_header
 *
- * PARAMETERS:  Signature           - ACPI signature of needed table
+ * PARAMETERS:  signature           - ACPI signature of needed table
- *              Instance            - Which instance (for SSDTs)
+ *              instance            - Which instance (for SSDTs)
 *              out_table_header    - The pointer to the table header to fill
 *
 * RETURN:      Status and pointer to mapped table header
@@ -382,8 +333,8 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
 *
 * FUNCTION:    acpi_get_table_with_size
 *
- * PARAMETERS:  Signature           - ACPI signature of needed table
+ * PARAMETERS:  signature           - ACPI signature of needed table
- *              Instance            - Which instance (for SSDTs)
+ *              instance            - Which instance (for SSDTs)
 *              out_table           - Where the pointer to the table is returned
 *
 * RETURN:      Status and pointer to table
@@ -453,7 +404,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
 * FUNCTION:    acpi_get_table_by_index
 *
 * PARAMETERS:  table_index         - Table index
- *              Table               - Where the pointer to the table is returned
+ *              table               - Where the pointer to the table is returned
 *
 * RETURN:      Status and pointer to the table
 *
@@ -502,157 +453,13 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
 ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_load_namespace
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load the namespace from the DSDT and all SSDTs/PSDTs found in
- *              the RSDT/XSDT.
- *
- ******************************************************************************/
-static acpi_status acpi_tb_load_namespace(void)
-{
-        acpi_status status;
-        u32 i;
-        struct acpi_table_header *new_dsdt;
-        ACPI_FUNCTION_TRACE(tb_load_namespace);
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        /*
-         * Load the namespace. The DSDT is required, but any SSDT and
-         * PSDT tables are optional. Verify the DSDT.
-         */
-        if (!acpi_gbl_root_table_list.current_table_count ||
-            !ACPI_COMPARE_NAME(&
-                               (acpi_gbl_root_table_list.
-                                tables[ACPI_TABLE_INDEX_DSDT].signature),
-                               ACPI_SIG_DSDT)
-            ||
-            ACPI_FAILURE(acpi_tb_verify_table
-                         (&acpi_gbl_root_table_list.
-                          tables[ACPI_TABLE_INDEX_DSDT]))) {
-                status = AE_NO_ACPI_TABLES;
-                goto unlock_and_exit;
-        }
-        /*
-         * Save the DSDT pointer for simple access. This is the mapped memory
-         * address. We must take care here because the address of the .Tables
-         * array can change dynamically as tables are loaded at run-time. Note:
-         * .Pointer field is not validated until after call to acpi_tb_verify_table.
-         */
-        acpi_gbl_DSDT =
-            acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
-        /*
-         * Optionally copy the entire DSDT to local memory (instead of simply
-         * mapping it.) There are some BIOSs that corrupt or replace the original
-         * DSDT, creating the need for this option. Default is FALSE, do not copy
-         * the DSDT.
-         */
-        if (acpi_gbl_copy_dsdt_locally) {
-                new_dsdt = acpi_tb_copy_dsdt(ACPI_TABLE_INDEX_DSDT);
-                if (new_dsdt) {
-                        acpi_gbl_DSDT = new_dsdt;
-                }
-        }
-        /*
-         * Save the original DSDT header for detection of table corruption
-         * and/or replacement of the DSDT from outside the OS.
-         */
-        ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
-                    sizeof(struct acpi_table_header));
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        /* Load and parse tables */
-        status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-        /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
-        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-                if ((!ACPI_COMPARE_NAME
-                     (&(acpi_gbl_root_table_list.tables[i].signature),
-                      ACPI_SIG_SSDT)
-                     &&
-                     !ACPI_COMPARE_NAME(&
-                                        (acpi_gbl_root_table_list.tables[i].
-                                         signature), ACPI_SIG_PSDT))
-                    ||
-                    ACPI_FAILURE(acpi_tb_verify_table
-                                 (&acpi_gbl_root_table_list.tables[i]))) {
-                        continue;
-                }
-                if (no_auto_ssdt) {
-                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
-                        continue;
-                }
-                /* Ignore errors while loading tables, get as many as possible */
-                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-                (void)acpi_ns_load_table(i, acpi_gbl_root_node);
-                (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
-        return_ACPI_STATUS(status);
-}
-/*******************************************************************************
- *
- * FUNCTION:    acpi_load_tables
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
- *
- ******************************************************************************/
-acpi_status acpi_load_tables(void)
-{
-        acpi_status status;
-        ACPI_FUNCTION_TRACE(acpi_load_tables);
-        /* Load the namespace from the tables */
-        status = acpi_tb_load_namespace();
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "While loading namespace from ACPI tables"));
-        }
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_load_tables)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_install_table_handler
 *
- * PARAMETERS:  Handler         - Table event handler
+ * PARAMETERS:  handler         - Table event handler
- *              Context         - Value passed to the handler on each event
+ *              context         - Value passed to the handler on each event
 *
 * RETURN:      Status
 *
@@ -698,7 +505,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler)
 *
 * FUNCTION:    acpi_remove_table_handler
 *
- * PARAMETERS:  Handler         - Table event handler that was installed
+ * PARAMETERS:  handler         - Table event handler that was installed
 *                                previously.
 *
 * RETURN:      Status
@@ -734,15 +541,3 @@ acpi_status acpi_remove_table_handler(acpi_tbl_handler handler)
 }
 ACPI_EXPORT_SYMBOL(acpi_remove_table_handler)
-static int __init acpi_no_auto_ssdt_setup(char *s) {
-        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
-        no_auto_ssdt = 1;
-        return 1;
-}
-__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
new file mode 100644
index 000000000000..f87cc63e69a1
--- /dev/null
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -0,0 +1,389 @@
+/******************************************************************************
+ *
+ * Module Name: tbxfload - Table load/unload external interfaces
+ *
+ *****************************************************************************/
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+#include <linux/export.h>
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "actables.h"
+#define _COMPONENT          ACPI_TABLES
+ACPI_MODULE_NAME("tbxfload")
+/* Local prototypes */
+static acpi_status acpi_tb_load_namespace(void);
+static int no_auto_ssdt;
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_load_tables
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
+ *
+ ******************************************************************************/
+acpi_status acpi_load_tables(void)
+{
+        acpi_status status;
+        ACPI_FUNCTION_TRACE(acpi_load_tables);
+        /* Load the namespace from the tables */
+        status = acpi_tb_load_namespace();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While loading namespace from ACPI tables"));
+        }
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_load_tables)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_load_namespace
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the namespace from the DSDT and all SSDTs/PSDTs found in
+ *              the RSDT/XSDT.
+ *
+ ******************************************************************************/
+static acpi_status acpi_tb_load_namespace(void)
+{
+        acpi_status status;
+        u32 i;
+        struct acpi_table_header *new_dsdt;
+        ACPI_FUNCTION_TRACE(tb_load_namespace);
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        /*
+         * Load the namespace. The DSDT is required, but any SSDT and
+         * PSDT tables are optional. Verify the DSDT.
+         */
+        if (!acpi_gbl_root_table_list.current_table_count ||
+            !ACPI_COMPARE_NAME(&
+                               (acpi_gbl_root_table_list.
+                                tables[ACPI_TABLE_INDEX_DSDT].signature),
+                               ACPI_SIG_DSDT)
+            ||
+            ACPI_FAILURE(acpi_tb_verify_table
+                         (&acpi_gbl_root_table_list.
+                          tables[ACPI_TABLE_INDEX_DSDT]))) {
+                status = AE_NO_ACPI_TABLES;
+                goto unlock_and_exit;
+        }
+        /*
+         * Save the DSDT pointer for simple access. This is the mapped memory
+         * address. We must take care here because the address of the .Tables
+         * array can change dynamically as tables are loaded at run-time. Note:
+         * .Pointer field is not validated until after call to acpi_tb_verify_table.
+         */
+        acpi_gbl_DSDT =
+            acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT].pointer;
+        /*
+         * Optionally copy the entire DSDT to local memory (instead of simply
+         * mapping it.) There are some BIOSs that corrupt or replace the original
+         * DSDT, creating the need for this option. Default is FALSE, do not copy
+         * the DSDT.
+         */
+        if (acpi_gbl_copy_dsdt_locally) {
+                new_dsdt = acpi_tb_copy_dsdt(ACPI_TABLE_INDEX_DSDT);
+                if (new_dsdt) {
+                        acpi_gbl_DSDT = new_dsdt;
+                }
+        }
+        /*
+         * Save the original DSDT header for detection of table corruption
+         * and/or replacement of the DSDT from outside the OS.
+         */
+        ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
+                    sizeof(struct acpi_table_header));
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        /* Load and parse tables */
+        status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
+        (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
+                if ((!ACPI_COMPARE_NAME
+                     (&(acpi_gbl_root_table_list.tables[i].signature),
+                      ACPI_SIG_SSDT)
+                     &&
+                     !ACPI_COMPARE_NAME(&
+                                        (acpi_gbl_root_table_list.tables[i].
+                                         signature), ACPI_SIG_PSDT))
+                    ||
+                    ACPI_FAILURE(acpi_tb_verify_table
+                                 (&acpi_gbl_root_table_list.tables[i]))) {
+                        continue;
+                }
+                if (no_auto_ssdt) {
+                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
+                        continue;
+                }
+                /* Ignore errors while loading tables, get as many as possible */
+                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+                (void)acpi_ns_load_table(i, acpi_gbl_root_node);
+                (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        }
+        ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI Tables successfully acquired\n"));
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+        return_ACPI_STATUS(status);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_load_table
+ *
+ * PARAMETERS:  table               - Pointer to a buffer containing the ACPI
+ *                                    table to be loaded.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dynamically load an ACPI table from the caller's buffer. Must
+ *              be a valid ACPI table with a valid ACPI table header.
+ *              Note1: Mainly intended to support hotplug addition of SSDTs.
+ *              Note2: Does not copy the incoming table. User is reponsible
+ *              to ensure that the table is not deleted or unmapped.
+ *
+ ******************************************************************************/
+acpi_status acpi_load_table(struct acpi_table_header *table)
+{
+        acpi_status status;
+        struct acpi_table_desc table_desc;
+        u32 table_index;
+        ACPI_FUNCTION_TRACE(acpi_load_table);
+        /* Parameter validation */
+        if (!table) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        /* Init local table descriptor */
+        ACPI_MEMSET(&table_desc, 0, sizeof(struct acpi_table_desc));
+        table_desc.address = ACPI_PTR_TO_PHYSADDR(table);
+        table_desc.pointer = table;
+        table_desc.length = table->length;
+        table_desc.flags = ACPI_TABLE_ORIGIN_UNKNOWN;
+        /* Must acquire the interpreter lock during this operation */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        /* Install the table and load it into the namespace */
+        ACPI_INFO((AE_INFO, "Host-directed Dynamic ACPI Table Load:"));
+        status = acpi_tb_add_table(&table_desc, &table_index);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+        status = acpi_ns_load_table(table_index, acpi_gbl_root_node);
+        /* Invoke table handler if present */
+        if (acpi_gbl_table_handler) {
+                (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD, table,
+                                             acpi_gbl_table_handler_context);
+        }
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_load_table)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_unload_parent_table
+ *
+ * PARAMETERS:  object              - Handle to any namespace object owned by
+ *                                    the table to be unloaded
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Via any namespace object within an SSDT or OEMx table, unloads
+ *              the table and deletes all namespace objects associated with
+ *              that table. Unloading of the DSDT is not allowed.
+ *              Note: Mainly intended to support hotplug removal of SSDTs.
+ *
+ ******************************************************************************/
+acpi_status acpi_unload_parent_table(acpi_handle object)
+{
+        struct acpi_namespace_node *node =
+            ACPI_CAST_PTR(struct acpi_namespace_node, object);
+        acpi_status status = AE_NOT_EXIST;
+        acpi_owner_id owner_id;
+        u32 i;
+        ACPI_FUNCTION_TRACE(acpi_unload_parent_table);
+        /* Parameter validation */
+        if (!object) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+        /*
+         * The node owner_id is currently the same as the parent table ID.
+         * However, this could change in the future.
+         */
+        owner_id = node->owner_id;
+        if (!owner_id) {
+                /* owner_id==0 means DSDT is the owner. DSDT cannot be unloaded */
+                return_ACPI_STATUS(AE_TYPE);
+        }
+        /* Must acquire the interpreter lock during this operation */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+        /* Find the table in the global table list */
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; i++) {
+                if (owner_id != acpi_gbl_root_table_list.tables[i].owner_id) {
+                        continue;
+                }
+                /*
+                 * Allow unload of SSDT and OEMx tables only. Do not allow unload
+                 * of the DSDT. No other types of tables should get here, since
+                 * only these types can contain AML and thus are the only types
+                 * that can create namespace objects.
+                 */
+                if (ACPI_COMPARE_NAME
+                    (acpi_gbl_root_table_list.tables[i].signature.ascii,
+                     ACPI_SIG_DSDT)) {
+                        status = AE_TYPE;
+                        break;
+                }
+                /* Ensure the table is actually loaded */
+                if (!acpi_tb_is_table_loaded(i)) {
+                        status = AE_NOT_EXIST;
+                        break;
+                }
+                /* Invoke table handler if present */
+                if (acpi_gbl_table_handler) {
+                        (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,
+                                                     acpi_gbl_root_table_list.
+                                                     tables[i].pointer,
+                                                     acpi_gbl_table_handler_context);
+                }
+                /*
+                 * Delete all namespace objects owned by this table. Note that
+                 * these objects can appear anywhere in the namespace by virtue
+                 * of the AML "Scope" operator. Thus, we need to track ownership
+                 * by an ID, not simply a position within the hierarchy.
+                 */
+                status = acpi_tb_delete_namespace_by_owner(i);
+                if (ACPI_FAILURE(status)) {
+                        break;
+                }
+                status = acpi_tb_release_owner_id(i);
+                acpi_tb_set_table_loaded_flag(i, FALSE);
+                break;
+        }
+        (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_unload_parent_table)
+static int __init acpi_no_auto_ssdt_setup(char *s) {
+        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
+        no_auto_ssdt = 1;
+        return 1;
+}
+__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 4258f647ca3d..74e720800037 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -57,7 +57,7 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
 *
 * FUNCTION:    acpi_tb_validate_rsdp
 *
- * PARAMETERS:  Rsdp                - Pointer to unvalidated RSDP
+ * PARAMETERS:  rsdp                - Pointer to unvalidated RSDP
 *
 * RETURN:      Status
 *
@@ -107,10 +107,10 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 *
 * RETURN:      Status, RSDP physical address
 *
- * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
+ * DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor
 *              pointer structure.  If it is found, set *RSDP to point to it.
 *
- * NOTE1:       The RSDP must be either in the first 1_k of the Extended
+ * NOTE1:       The RSDP must be either in the first 1K of the Extended
 *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
 *              Only a 32-bit physical address is necessary.
 *
@@ -152,7 +152,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
        if (physical_address > 0x400) {
                /*
                 * 1b) Search EBDA paragraphs (EBDA is required to be a
-                 *     minimum of 1_k length)
+                 *     minimum of 1K length)
                 */
                table_ptr = acpi_os_map_memory((acpi_physical_address)
                                               physical_address,
@@ -216,7 +216,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
        /* A valid RSDP was not found */
-        ACPI_ERROR((AE_INFO, "A valid RSDP was not found"));
+        ACPI_BIOS_ERROR((AE_INFO, "A valid RSDP was not found"));
        return_ACPI_STATUS(AE_NOT_FOUND);
 }
@@ -225,7 +225,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
 * FUNCTION:    acpi_tb_scan_memory_for_rsdp
 *
 * PARAMETERS:  start_address       - Starting pointer for search
- *              Length              - Maximum length to search
+ *              length              - Maximum length to search
 *
 * RETURN:      Pointer to the RSDP if found, otherwise NULL.
 *
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index 67932aebe6dd..64880306133d 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -53,8 +53,8 @@ ACPI_MODULE_NAME("utaddress")
 * FUNCTION:    acpi_ut_add_address_range
 *
 * PARAMETERS:  space_id            - Address space ID
- *              Address             - op_region start address
+ *              address             - op_region start address
- *              Length              - op_region length
+ *              length              - op_region length
 *              region_node         - op_region namespace node
 *
 * RETURN:      Status
@@ -186,9 +186,9 @@ acpi_ut_remove_address_range(acpi_adr_space_type space_id,
 * FUNCTION:    acpi_ut_check_address_range
 *
 * PARAMETERS:  space_id            - Address space ID
- *              Address             - Start address
+ *              address             - Start address
- *              Length              - Length of address range
+ *              length              - Length of address range
- *              Warn                - TRUE if warning on overlap desired
+ *              warn                - TRUE if warning on overlap desired
 *
 * RETURN:      Count of the number of conflicts detected. Zero is always
 *              returned for Space IDs other than Memory or I/O.
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 9982d2ea66fb..ed29d474095e 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -189,7 +189,7 @@ acpi_status acpi_ut_delete_caches(void)
 *
 * FUNCTION:    acpi_ut_validate_buffer
 *
- * PARAMETERS:  Buffer              - Buffer descriptor to be validated
+ * PARAMETERS:  buffer              - Buffer descriptor to be validated
 *
 * RETURN:      Status
 *
@@ -227,7 +227,7 @@ acpi_status acpi_ut_validate_buffer(struct acpi_buffer * buffer)
 *
 * FUNCTION:    acpi_ut_initialize_buffer
 *
- * PARAMETERS:  Buffer              - Buffer to be validated
+ * PARAMETERS:  buffer              - Buffer to be validated
 *              required_length     - Length needed
 *
 * RETURN:      Status
@@ -308,10 +308,10 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 *
 * FUNCTION:    acpi_ut_allocate
 *
- * PARAMETERS:  Size                - Size of the allocation
+ * PARAMETERS:  size                - Size of the allocation
- *              Component           - Component type of caller
+ *              component           - Component type of caller
- *              Module              - Source file name of caller
+ *              module              - Source file name of caller
- *              Line                - Line number of caller
+ *              line                - Line number of caller
 *
 * RETURN:      Address of the allocated memory on success, NULL on failure.
 *
@@ -352,10 +352,10 @@ void *acpi_ut_allocate(acpi_size size,
 *
 * FUNCTION:    acpi_ut_allocate_zeroed
 *
- * PARAMETERS:  Size                - Size of the allocation
+ * PARAMETERS:  size                - Size of the allocation
- *              Component           - Component type of caller
+ *              component           - Component type of caller
- *              Module              - Source file name of caller
+ *              module              - Source file name of caller
- *              Line                - Line number of caller
+ *              line                - Line number of caller
 *
 * RETURN:      Address of the allocated memory on success, NULL on failure.
 *
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 3317c0a406ee..294692ae76e9 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -317,7 +317,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
 * FUNCTION:    acpi_ut_copy_ipackage_to_epackage
 *
 * PARAMETERS:  internal_object     - Pointer to the object we are returning
- *              Buffer              - Where the object is returned
+ *              buffer              - Where the object is returned
 *              space_used          - Where the object length is returned
 *
 * RETURN:      Status
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index a0998a886318..e810894149ae 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -145,7 +145,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Format              - Printf format field
+ *              format              - Printf format field
 *              ...                 - Optional printf arguments
 *
 * RETURN:      None
@@ -217,7 +217,7 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Format              - Printf format field
+ *              format              - Printf format field
 *              ...                 - Optional printf arguments
 *
 * RETURN:      None
@@ -286,7 +286,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Pointer             - Pointer to display
+ *              pointer             - Pointer to display
 *
 * RETURN:      None
 *
@@ -315,7 +315,7 @@ acpi_ut_trace_ptr(u32 line_number,
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              String              - Additional string to display
+ *              string              - Additional string to display
 *
 * RETURN:      None
 *
@@ -346,7 +346,7 @@ acpi_ut_trace_str(u32 line_number,
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Integer             - Integer to display
+ *              integer             - Integer to display
 *
 * RETURN:      None
 *
@@ -408,7 +408,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Status              - Exit status code
+ *              status              - Exit status code
 *
 * RETURN:      None
 *
@@ -449,7 +449,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Value               - Value to be printed with exit msg
+ *              value               - Value to be printed with exit msg
 *
 * RETURN:      None
 *
@@ -481,7 +481,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              Ptr                 - Pointer to display
+ *              ptr                 - Pointer to display
 *
 * RETURN:      None
 *
@@ -508,10 +508,10 @@ acpi_ut_ptr_exit(u32 line_number,
 *
 * FUNCTION:    acpi_ut_dump_buffer
 *
- * PARAMETERS:  Buffer              - Buffer to dump
+ * PARAMETERS:  buffer              - Buffer to dump
- *              Count               - Amount to dump, in bytes
+ *              count               - Amount to dump, in bytes
- *              Display             - BYTE, WORD, DWORD, or QWORD display
+ *              display             - BYTE, WORD, DWORD, or QWORD display
- *              component_iD        - Caller's component ID
+ *              component_ID        - Caller's component ID
 *
 * RETURN:      None
 *
@@ -625,10 +625,10 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 *
 * FUNCTION:    acpi_ut_dump_buffer
 *
- * PARAMETERS:  Buffer              - Buffer to dump
+ * PARAMETERS:  buffer              - Buffer to dump
- *              Count               - Amount to dump, in bytes
+ *              count               - Amount to dump, in bytes
- *              Display             - BYTE, WORD, DWORD, or QWORD display
+ *              display             - BYTE, WORD, DWORD, or QWORD display
- *              component_iD        - Caller's component ID
+ *              component_ID        - Caller's component ID
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 684849949bf3..60a158472d82 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -49,41 +49,6 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdecode")
-/*******************************************************************************
- *
- * FUNCTION:    acpi_format_exception
- *
- * PARAMETERS:  Status       - The acpi_status code to be formatted
- *
- * RETURN:      A string containing the exception text. A valid pointer is
- *              always returned.
- *
- * DESCRIPTION: This function translates an ACPI exception into an ASCII string
- *              It is here instead of utxface.c so it is always present.
- *
- ******************************************************************************/
-const char *acpi_format_exception(acpi_status status)
-{
-        const char *exception = NULL;
-        ACPI_FUNCTION_ENTRY();
-        exception = acpi_ut_validate_exception(status);
-        if (!exception) {
-                /* Exception code was not recognized */
-                ACPI_ERROR((AE_INFO,
-                            "Unknown exception code: 0x%8.8X", status));
-                exception = "UNKNOWN_STATUS_CODE";
-        }
-        return (ACPI_CAST_PTR(const char, exception));
-}
-ACPI_EXPORT_SYMBOL(acpi_format_exception)
 /*
 * Properties of the ACPI Object Types, both internal and external.
 * The table is indexed by values of acpi_object_type
@@ -126,8 +91,8 @@ const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES] = {
 *
 * FUNCTION:    acpi_ut_hex_to_ascii_char
 *
- * PARAMETERS:  Integer             - Contains the hex digit
+ * PARAMETERS:  integer             - Contains the hex digit
- *              Position            - bit position of the digit within the
+ *              position            - bit position of the digit within the
 *                                    integer (multiple of 4)
 *
 * RETURN:      The converted Ascii character
@@ -164,16 +129,17 @@ char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
 /* Region type decoding */
 const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
-        "SystemMemory",
+        "SystemMemory",         /* 0x00 */
-        "SystemIO",
+        "SystemIO",             /* 0x01 */
-        "PCI_Config",
+        "PCI_Config",           /* 0x02 */
-        "EmbeddedControl",
+        "EmbeddedControl",      /* 0x03 */
-        "SMBus",
+        "SMBus",                /* 0x04 */
-        "SystemCMOS",
+        "SystemCMOS",           /* 0x05 */
-        "PCIBARTarget",
+        "PCIBARTarget",         /* 0x06 */
-        "IPMI",
+        "IPMI",                 /* 0x07 */
-        "GeneralPurposeIo",
+        "GeneralPurposeIo",     /* 0x08 */
-        "GenericSerialBus"
+        "GenericSerialBus",     /* 0x09 */
+        "PCC"                   /* 0x0A */
 };
 char *acpi_ut_get_region_name(u8 space_id)
@@ -228,7 +194,7 @@ char *acpi_ut_get_event_name(u32 event_id)
 *
 * FUNCTION:    acpi_ut_get_type_name
 *
- * PARAMETERS:  Type                - An ACPI object type
+ * PARAMETERS:  type                - An ACPI object type
 *
 * RETURN:      Decoded ACPI object type name
 *
@@ -306,7 +272,7 @@ char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
 *
 * FUNCTION:    acpi_ut_get_node_name
 *
- * PARAMETERS:  Object               - A namespace node
+ * PARAMETERS:  object               - A namespace node
 *
 * RETURN:      ASCII name of the node
 *
@@ -351,7 +317,7 @@ char *acpi_ut_get_node_name(void *object)
 *
 * FUNCTION:    acpi_ut_get_descriptor_name
 *
- * PARAMETERS:  Object               - An ACPI object
+ * PARAMETERS:  object               - An ACPI object
 *
 * RETURN:      Decoded name of the descriptor type
 *
@@ -401,7 +367,7 @@ char *acpi_ut_get_descriptor_name(void *object)
 *
 * FUNCTION:    acpi_ut_get_reference_name
 *
- * PARAMETERS:  Object               - An ACPI reference object
+ * PARAMETERS:  object               - An ACPI reference object
 *
 * RETURN:      Decoded name of the type of reference
 *
@@ -532,7 +498,7 @@ const char *acpi_ut_get_notify_name(u32 notify_value)
 *
 * FUNCTION:    acpi_ut_valid_object_type
 *
- * PARAMETERS:  Type            - Object type to be validated
+ * PARAMETERS:  type            - Object type to be validated
 *
 * RETURN:      TRUE if valid object type, FALSE otherwise
 *
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 2a6c3e183697..798105443d0f 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -60,7 +60,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action);
 *
 * FUNCTION:    acpi_ut_delete_internal_obj
 *
- * PARAMETERS:  Object         - Object to be deleted
+ * PARAMETERS:  object         - Object to be deleted
 *
 * RETURN:      None
 *
@@ -152,7 +152,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
        case ACPI_TYPE_PROCESSOR:
        case ACPI_TYPE_THERMAL:
-                /* Walk the notify handler list for this object */
+                /* Walk the address handler list for this object */
                handler_desc = object->common_notify.handler;
                while (handler_desc) {
@@ -358,8 +358,8 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)
 *
 * FUNCTION:    acpi_ut_update_ref_count
 *
- * PARAMETERS:  Object          - Object whose ref count is to be updated
+ * PARAMETERS:  object          - Object whose ref count is to be updated
- *              Action          - What to do
+ *              action          - What to do
 *
 * RETURN:      New ref count
 *
@@ -456,9 +456,9 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
 *
 * FUNCTION:    acpi_ut_update_object_reference
 *
- * PARAMETERS:  Object              - Increment ref count for this object
+ * PARAMETERS:  object              - Increment ref count for this object
 *                                    and all sub-objects
- *              Action              - Either REF_INCREMENT or REF_DECREMENT or
+ *              action              - Either REF_INCREMENT or REF_DECREMENT or
 *                                    REF_FORCE_DELETE
 *
 * RETURN:      Status
@@ -480,6 +480,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
        acpi_status status = AE_OK;
        union acpi_generic_state *state_list = NULL;
        union acpi_operand_object *next_object = NULL;
+        union acpi_operand_object *prev_object;
        union acpi_generic_state *state;
        u32 i;
@@ -505,12 +506,21 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
                case ACPI_TYPE_POWER:
                case ACPI_TYPE_THERMAL:
-                        /* Update the notify objects for these types (if present) */
+                        /*
+                         * Update the notify objects for these types (if present)
-                        acpi_ut_update_ref_count(object->common_notify.
+                         * Two lists, system and device notify handlers.
-                                                 system_notify, action);
+                         */
-                        acpi_ut_update_ref_count(object->common_notify.
+                        for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) {
-                                                 device_notify, action);
+                                prev_object =
+                                    object->common_notify.notify_list[i];
+                                while (prev_object) {
+                                        next_object =
+                                            prev_object->notify.next[i];
+                                        acpi_ut_update_ref_count(prev_object,
+                                                                 action);
+                                        prev_object = next_object;
+                                }
+                        }
                        break;
                case ACPI_TYPE_PACKAGE:
@@ -630,7 +640,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
 *
 * FUNCTION:    acpi_ut_add_reference
 *
- * PARAMETERS:  Object          - Object whose reference count is to be
+ * PARAMETERS:  object          - Object whose reference count is to be
 *                                incremented
 *
 * RETURN:      None
@@ -664,7 +674,7 @@ void acpi_ut_add_reference(union acpi_operand_object *object)
 *
 * FUNCTION:    acpi_ut_remove_reference
 *
- * PARAMETERS:  Object         - Object whose ref count will be decremented
+ * PARAMETERS:  object         - Object whose ref count will be decremented
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 479f32b33415..a9c65fbea5f4 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("uteval")
 * FUNCTION:    acpi_ut_evaluate_object
 *
 * PARAMETERS:  prefix_node         - Starting node
- *              Path                - Path to object from starting node
+ *              path                - Path to object from starting node
 *              expected_return_types - Bitmap of allowed return types
 *              return_desc         - Where a return value is stored
 *
@@ -187,7 +187,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 *
 * PARAMETERS:  object_name         - Object name to be evaluated
 *              device_node         - Node for the device
- *              Value               - Where the value is returned
+ *              value               - Where the value is returned
 *
 * RETURN:      Status
 *
@@ -229,7 +229,7 @@ acpi_ut_evaluate_numeric_object(char *object_name,
 * FUNCTION:    acpi_ut_execute_STA
 *
 * PARAMETERS:  device_node         - Node for the device
- *              Flags               - Where the status flags are returned
+ *              flags               - Where the status flags are returned
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c
new file mode 100644
index 000000000000..23b98945f6b7
--- /dev/null
+++ b/drivers/acpi/acpica/utexcep.c
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ *
+ * Module Name: utexcep - Exception code support
+ *
+ ******************************************************************************/
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+#define ACPI_DEFINE_EXCEPTION_TABLE
+#include <linux/export.h>
+#include <acpi/acpi.h>
+#include "accommon.h"
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utexcep")
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_format_exception
+ *
+ * PARAMETERS:  status              - The acpi_status code to be formatted
+ *
+ * RETURN:      A string containing the exception text. A valid pointer is
+ *              always returned.
+ *
+ * DESCRIPTION: This function translates an ACPI exception into an ASCII
+ *              string. Returns "unknown status" string for invalid codes.
+ *
+ ******************************************************************************/
+const char *acpi_format_exception(acpi_status status)
+{
+        const char *exception = NULL;
+        ACPI_FUNCTION_ENTRY();
+        exception = acpi_ut_validate_exception(status);
+        if (!exception) {
+                /* Exception code was not recognized */
+                ACPI_ERROR((AE_INFO,
+                            "Unknown exception code: 0x%8.8X", status));
+                exception = "UNKNOWN_STATUS_CODE";
+        }
+        return (ACPI_CAST_PTR(const char, exception));
+}
+ACPI_EXPORT_SYMBOL(acpi_format_exception)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_validate_exception
+ *
+ * PARAMETERS:  status              - The acpi_status code to be formatted
+ *
+ * RETURN:      A string containing the exception text. NULL if exception is
+ *              not valid.
+ *
+ * DESCRIPTION: This function validates and translates an ACPI exception into
+ *              an ASCII string.
+ *
+ ******************************************************************************/
+const char *acpi_ut_validate_exception(acpi_status status)
+{
+        u32 sub_status;
+        const char *exception = NULL;
+        ACPI_FUNCTION_ENTRY();
+        /*
+         * Status is composed of two parts, a "type" and an actual code
+         */
+        sub_status = (status & ~AE_CODE_MASK);
+        switch (status & AE_CODE_MASK) {
+        case AE_CODE_ENVIRONMENTAL:
+                if (sub_status <= AE_CODE_ENV_MAX) {
+                        exception = acpi_gbl_exception_names_env[sub_status];
+                }
+                break;
+        case AE_CODE_PROGRAMMER:
+                if (sub_status <= AE_CODE_PGM_MAX) {
+                        exception = acpi_gbl_exception_names_pgm[sub_status];
+                }
+                break;
+        case AE_CODE_ACPI_TABLES:
+                if (sub_status <= AE_CODE_TBL_MAX) {
+                        exception = acpi_gbl_exception_names_tbl[sub_status];
+                }
+                break;
+        case AE_CODE_AML:
+                if (sub_status <= AE_CODE_AML_MAX) {
+                        exception = acpi_gbl_exception_names_aml[sub_status];
+                }
+                break;
+        case AE_CODE_CONTROL:
+                if (sub_status <= AE_CODE_CTRL_MAX) {
+                        exception = acpi_gbl_exception_names_ctrl[sub_status];
+                }
+                break;
+        default:
+                break;
+        }
+        return (ACPI_CAST_PTR(const char, exception));
+}
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 90f53b42eca9..ed1893155f8b 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -247,8 +247,9 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Init library globals.  All globals that require specific
+ * DESCRIPTION: Initialize ACPICA globals. All globals that require specific
- *              initialization should be initialized here!
+ *              initialization should be initialized here. This allows for
+ *              a warm restart.
 *
 ******************************************************************************/
@@ -284,7 +285,7 @@ acpi_status acpi_ut_init_globals(void)
                acpi_gbl_owner_id_mask[i] = 0;
        }
-        /* Last owner_iD is never valid */
+        /* Last owner_ID is never valid */
        acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;
@@ -304,8 +305,8 @@ acpi_status acpi_ut_init_globals(void)
        /* Global handlers */
-        acpi_gbl_system_notify.handler = NULL;
+        acpi_gbl_global_notify[0].handler = NULL;
-        acpi_gbl_device_notify.handler = NULL;
+        acpi_gbl_global_notify[1].handler = NULL;
        acpi_gbl_exception_handler = NULL;
        acpi_gbl_init_handler = NULL;
        acpi_gbl_table_handler = NULL;
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index c92eb1d93785..5d84e1954575 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 *
- * Module Name: utids - support for device IDs - HID, UID, CID
+ * Module Name: utids - support for device Ids - HID, UID, CID
 *
 *****************************************************************************/
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index 155fd786d0f2..b1eb7f17e110 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("utlock")
 * FUNCTION:    acpi_ut_create_rw_lock
 *              acpi_ut_delete_rw_lock
 *
- * PARAMETERS:  Lock                - Pointer to a valid RW lock
+ * PARAMETERS:  lock                - Pointer to a valid RW lock
 *
 * RETURN:      Status
 *
@@ -89,7 +89,7 @@ void acpi_ut_delete_rw_lock(struct acpi_rw_lock *lock)
 * FUNCTION:    acpi_ut_acquire_read_lock
 *              acpi_ut_release_read_lock
 *
- * PARAMETERS:  Lock                - Pointer to a valid RW lock
+ * PARAMETERS:  lock                - Pointer to a valid RW lock
 *
 * RETURN:      Status
 *
@@ -149,7 +149,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
 * FUNCTION:    acpi_ut_acquire_write_lock
 *              acpi_ut_release_write_lock
 *
- * PARAMETERS:  Lock                - Pointer to a valid RW lock
+ * PARAMETERS:  lock                - Pointer to a valid RW lock
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index 2491a552b0e6..d88a8aaab2a6 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -73,8 +73,8 @@ typedef union uint64_overlay {
 *
 * FUNCTION:    acpi_ut_short_divide
 *
- * PARAMETERS:  Dividend            - 64-bit dividend
+ * PARAMETERS:  dividend            - 64-bit dividend
- *              Divisor             - 32-bit divisor
+ *              divisor             - 32-bit divisor
 *              out_quotient        - Pointer to where the quotient is returned
 *              out_remainder       - Pointer to where the remainder is returned
 *
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 86f19db74e05..33c6cf7ff467 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -50,79 +50,41 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
+#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ut_validate_exception
+ * FUNCTION:    ut_convert_backslashes
 *
- * PARAMETERS:  Status       - The acpi_status code to be formatted
+ * PARAMETERS:  pathname        - File pathname string to be converted
 *
- * RETURN:      A string containing the exception text. NULL if exception is
+ * RETURN:      Modifies the input Pathname
- *              not valid.
 *
- * DESCRIPTION: This function validates and translates an ACPI exception into
+ * DESCRIPTION: Convert all backslashes (0x5C) to forward slashes (0x2F) within
- *              an ASCII string.
+ *              the entire input file pathname string.
 *
 ******************************************************************************/
-const char *acpi_ut_validate_exception(acpi_status status)
+void ut_convert_backslashes(char *pathname)
 {
-        u32 sub_status;
-        const char *exception = NULL;
-        ACPI_FUNCTION_ENTRY();
+        if (!pathname) {
+                return;
-        /*
+        }
-         * Status is composed of two parts, a "type" and an actual code
-         */
-        sub_status = (status & ~AE_CODE_MASK);
-        switch (status & AE_CODE_MASK) {
-        case AE_CODE_ENVIRONMENTAL:
-                if (sub_status <= AE_CODE_ENV_MAX) {
-                        exception = acpi_gbl_exception_names_env[sub_status];
-                }
-                break;
-        case AE_CODE_PROGRAMMER:
-                if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception = acpi_gbl_exception_names_pgm[sub_status];
-                }
-                break;
-        case AE_CODE_ACPI_TABLES:
-                if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception = acpi_gbl_exception_names_tbl[sub_status];
-                }
-                break;
-        case AE_CODE_AML:
-                if (sub_status <= AE_CODE_AML_MAX) {
-                        exception = acpi_gbl_exception_names_aml[sub_status];
-                }
-                break;
-        case AE_CODE_CONTROL:
-                if (sub_status <= AE_CODE_CTRL_MAX) {
+        while (*pathname) {
-                        exception = acpi_gbl_exception_names_ctrl[sub_status];
+                if (*pathname == '\\') {
+                        *pathname = '/';
                }
-                break;
-        default:
+                pathname++;
-                break;
        }
-        return (ACPI_CAST_PTR(const char, exception));
 }
+#endif
 /*******************************************************************************
 *
 * FUNCTION:    acpi_ut_is_pci_root_bridge
 *
- * PARAMETERS:  Id              - The HID/CID in string format
+ * PARAMETERS:  id              - The HID/CID in string format
 *
 * RETURN:      TRUE if the Id is a match for a PCI/PCI-Express Root Bridge
 *
@@ -150,7 +112,7 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
 *
 * FUNCTION:    acpi_ut_is_aml_table
 *
- * PARAMETERS:  Table               - An ACPI table
+ * PARAMETERS:  table               - An ACPI table
 *
 * RETURN:      TRUE if table contains executable AML; FALSE otherwise
 *
@@ -284,7 +246,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
 *
 * FUNCTION:    acpi_ut_release_owner_id
 *
- * PARAMETERS:  owner_id_ptr        - Pointer to a previously allocated owner_iD
+ * PARAMETERS:  owner_id_ptr        - Pointer to a previously allocated owner_ID
 *
 * RETURN:      None. No error is returned because we are either exiting a
 *              control method or unloading a table. Either way, we would
@@ -307,7 +269,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
        *owner_id_ptr = 0;
-        /* Zero is not a valid owner_iD */
+        /* Zero is not a valid owner_ID */
        if (owner_id == 0) {
                ACPI_ERROR((AE_INFO, "Invalid OwnerId: 0x%2.2X", owner_id));
@@ -381,7 +343,7 @@ void acpi_ut_strupr(char *src_string)
 *
 * FUNCTION:    acpi_ut_print_string
 *
- * PARAMETERS:  String          - Null terminated ASCII string
+ * PARAMETERS:  string          - Null terminated ASCII string
 *              max_length      - Maximum output length
 *
 * RETURN:      None
@@ -467,7 +429,7 @@ void acpi_ut_print_string(char *string, u8 max_length)
 *
 * FUNCTION:    acpi_ut_dword_byte_swap
 *
- * PARAMETERS:  Value           - Value to be converted
+ * PARAMETERS:  value           - Value to be converted
 *
 * RETURN:      u32 integer with bytes swapped
 *
@@ -537,9 +499,9 @@ void acpi_ut_set_integer_width(u8 revision)
 *
 * FUNCTION:    acpi_ut_display_init_pathname
 *
- * PARAMETERS:  Type                - Object type of the node
+ * PARAMETERS:  type                - Object type of the node
 *              obj_handle          - Handle whose pathname will be displayed
- *              Path                - Additional path string to be appended.
+ *              path                - Additional path string to be appended.
 *                                      (NULL if no extra path)
 *
 * RETURN:      acpi_status
@@ -604,8 +566,8 @@ acpi_ut_display_init_pathname(u8 type,
 *
 * FUNCTION:    acpi_ut_valid_acpi_char
 *
- * PARAMETERS:  Char            - The character to be examined
+ * PARAMETERS:  char            - The character to be examined
- *              Position        - Byte position (0-3)
+ *              position        - Byte position (0-3)
 *
 * RETURN:      TRUE if the character is valid, FALSE otherwise
 *
@@ -640,7 +602,7 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position)
 *
 * FUNCTION:    acpi_ut_valid_acpi_name
 *
- * PARAMETERS:  Name            - The name to be examined
+ * PARAMETERS:  name            - The name to be examined
 *
 * RETURN:      TRUE if the name is valid, FALSE otherwise
 *
@@ -671,7 +633,7 @@ u8 acpi_ut_valid_acpi_name(u32 name)
 *
 * FUNCTION:    acpi_ut_repair_name
 *
- * PARAMETERS:  Name            - The ACPI name to be repaired
+ * PARAMETERS:  name            - The ACPI name to be repaired
 *
 * RETURN:      Repaired version of the name
 *
@@ -705,8 +667,8 @@ acpi_name acpi_ut_repair_name(char *name)
 *
 * FUNCTION:    acpi_ut_strtoul64
 *
- * PARAMETERS:  String          - Null terminated string
+ * PARAMETERS:  string          - Null terminated string
- *              Base            - Radix of the string: 16 or ACPI_ANY_BASE;
+ *              base            - Radix of the string: 16 or ACPI_ANY_BASE;
 *                                ACPI_ANY_BASE means 'in behalf of to_integer'
 *              ret_integer     - Where the converted integer is returned
 *
@@ -755,7 +717,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
        if (to_integer_op) {
                /*
-                 * Base equal to ACPI_ANY_BASE means 'to_integer operation case'.
+                 * Base equal to ACPI_ANY_BASE means 'ToInteger operation case'.
                 * We need to determine if it is decimal or hexadecimal.
                 */
                if ((*string == '0') && (ACPI_TOLOWER(*(string + 1)) == 'x')) {
@@ -878,8 +840,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
 *
 * FUNCTION:    acpi_ut_create_update_state_and_push
 *
- * PARAMETERS:  Object          - Object to be added to the new state
+ * PARAMETERS:  object          - Object to be added to the new state
- *              Action          - Increment/Decrement
+ *              action          - Increment/Decrement
 *              state_list      - List the state will be added to
 *
 * RETURN:      Status
@@ -919,7 +881,7 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
 * PARAMETERS:  source_object       - The package to walk
 *              target_object       - Target object (if package is being copied)
 *              walk_callback       - Called once for each package element
- *              Context             - Passed to the callback function
+ *              context             - Passed to the callback function
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 43174df33121..296baa676bc5 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -147,7 +147,7 @@ void acpi_ut_mutex_terminate(void)
 *
 * FUNCTION:    acpi_ut_create_mutex
 *
- * PARAMETERS:  mutex_iD        - ID of the mutex to be created
+ * PARAMETERS:  mutex_ID        - ID of the mutex to be created
 *
 * RETURN:      Status
 *
@@ -176,7 +176,7 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
 *
 * FUNCTION:    acpi_ut_delete_mutex
 *
- * PARAMETERS:  mutex_iD        - ID of the mutex to be deleted
+ * PARAMETERS:  mutex_ID        - ID of the mutex to be deleted
 *
 * RETURN:      Status
 *
@@ -199,7 +199,7 @@ static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 *
 * FUNCTION:    acpi_ut_acquire_mutex
 *
- * PARAMETERS:  mutex_iD        - ID of the mutex to be acquired
+ * PARAMETERS:  mutex_ID        - ID of the mutex to be acquired
 *
 * RETURN:      Status
 *
@@ -283,7 +283,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 *
 * FUNCTION:    acpi_ut_release_mutex
 *
- * PARAMETERS:  mutex_iD        - ID of the mutex to be released
+ * PARAMETERS:  mutex_ID        - ID of the mutex to be released
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index b112744fc9ae..655f0799a391 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -69,7 +69,7 @@ acpi_ut_get_element_length(u8 object_type,
 * PARAMETERS:  module_name         - Source file name of caller
 *              line_number         - Line number of caller
 *              component_id        - Component type of caller
- *              Type                - ACPI Type of the new object
+ *              type                - ACPI Type of the new object
 *
 * RETURN:      A new internal object, null on failure
 *
@@ -150,7 +150,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char
 *
 * FUNCTION:    acpi_ut_create_package_object
 *
- * PARAMETERS:  Count               - Number of package elements
+ * PARAMETERS:  count               - Number of package elements
 *
 * RETURN:      Pointer to a new Package object, null on failure
 *
@@ -323,11 +323,11 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
 *
 * FUNCTION:    acpi_ut_valid_internal_object
 *
- * PARAMETERS:  Object              - Object to be validated
+ * PARAMETERS:  object              - Object to be validated
 *
 * RETURN:      TRUE if object is valid, FALSE otherwise
 *
- * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
+ * DESCRIPTION: Validate a pointer to be of type union acpi_operand_object
 *
 ******************************************************************************/
@@ -348,7 +348,7 @@ u8 acpi_ut_valid_internal_object(void *object)
        switch (ACPI_GET_DESCRIPTOR_TYPE(object)) {
        case ACPI_DESC_TYPE_OPERAND:
-                /* The object appears to be a valid union acpi_operand_object    */
+                /* The object appears to be a valid union acpi_operand_object */
                return (TRUE);
@@ -407,7 +407,7 @@ void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
 *
 * FUNCTION:    acpi_ut_delete_object_desc
 *
- * PARAMETERS:  Object          - An Acpi internal object to be deleted
+ * PARAMETERS:  object          - An Acpi internal object to be deleted
 *
 * RETURN:      None.
 *
@@ -419,7 +419,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
 {
        ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
-        /* Object must be a union acpi_operand_object    */
+        /* Object must be a union acpi_operand_object */
        if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
                ACPI_ERROR((AE_INFO,
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 2360cf70c18c..34ef0bd7e4b4 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -68,7 +68,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
        {"Windows 2001.1", NULL, 0, ACPI_OSI_WINSRV_2003},      /* Windows Server 2003 */
        {"Windows 2001 SP2", NULL, 0, ACPI_OSI_WIN_XP_SP2},     /* Windows XP SP2 */
        {"Windows 2001.1 SP1", NULL, 0, ACPI_OSI_WINSRV_2003_SP1},      /* Windows Server 2003 SP1 - Added 03/2006 */
-        {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA},  /* Windows Vista - Added 03/2006 */
+        {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA},  /* Windows vista - Added 03/2006 */
        {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008},      /* Windows Server 2008 - Added 09/2009 */
        {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1},  /* Windows Vista SP1 - Added 09/2009 */
        {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2},  /* Windows Vista SP2 - Added 09/2010 */
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index 9d441ea70305..e38bef4980bc 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -356,13 +356,13 @@ static const u8 acpi_gbl_resource_types[] = {
        ACPI_SMALL_VARIABLE_LENGTH,     /* 06 start_dependent_functions */
        ACPI_FIXED_LENGTH,      /* 07 end_dependent_functions */
        ACPI_FIXED_LENGTH,      /* 08 IO */
-        ACPI_FIXED_LENGTH,      /* 09 fixed_iO */
+        ACPI_FIXED_LENGTH,      /* 09 fixed_IO */
-        ACPI_FIXED_LENGTH,      /* 0_a fixed_dMA */
+        ACPI_FIXED_LENGTH,      /* 0A fixed_DMA */
        0,
        0,
        0,
-        ACPI_VARIABLE_LENGTH,   /* 0_e vendor_short */
+        ACPI_VARIABLE_LENGTH,   /* 0E vendor_short */
-        ACPI_FIXED_LENGTH,      /* 0_f end_tag */
+        ACPI_FIXED_LENGTH,      /* 0F end_tag */
        /* Large descriptors */
@@ -375,16 +375,16 @@ static const u8 acpi_gbl_resource_types[] = {
        ACPI_FIXED_LENGTH,      /* 06 memory32_fixed */
        ACPI_VARIABLE_LENGTH,   /* 07 Dword* address */
        ACPI_VARIABLE_LENGTH,   /* 08 Word* address */
-        ACPI_VARIABLE_LENGTH,   /* 09 extended_iRQ */
+        ACPI_VARIABLE_LENGTH,   /* 09 extended_IRQ */
-        ACPI_VARIABLE_LENGTH,   /* 0_a Qword* address */
+        ACPI_VARIABLE_LENGTH,   /* 0A Qword* address */
-        ACPI_FIXED_LENGTH,      /* 0_b Extended* address */
+        ACPI_FIXED_LENGTH,      /* 0B Extended* address */
-        ACPI_VARIABLE_LENGTH,   /* 0_c Gpio* */
+        ACPI_VARIABLE_LENGTH,   /* 0C Gpio* */
        0,
-        ACPI_VARIABLE_LENGTH    /* 0_e *serial_bus */
+        ACPI_VARIABLE_LENGTH    /* 0E *serial_bus */
 };
 /*
- * For the i_aSL compiler/disassembler, we don't want any error messages
+ * For the iASL compiler/disassembler, we don't want any error messages
 * because the disassembler uses the resource validation code to determine
 * if Buffer objects are actually Resource Templates.
 */
@@ -398,11 +398,11 @@ static const u8 acpi_gbl_resource_types[] = {
 *
 * FUNCTION:    acpi_ut_walk_aml_resources
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource template
+ * PARAMETERS:  aml             - Pointer to the raw AML resource template
 *              aml_length      - Length of the entire template
 *              user_function   - Called once for each descriptor found. If
 *                                NULL, a pointer to the end_tag is returned
- *              Context         - Passed to user_function
+ *              context         - Passed to user_function
 *
 * RETURN:      Status
 *
@@ -513,7 +513,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
 *
 * FUNCTION:    acpi_ut_validate_resource
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
 *              return_index    - Where the resource index is returned. NULL
 *                                if the index is not required.
 *
@@ -664,7 +664,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
 *
 * FUNCTION:    acpi_ut_get_resource_type
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
 *
 * RETURN:      The Resource Type with no extraneous bits (except the
 *              Large/Small descriptor bit -- this is left alone)
@@ -698,7 +698,7 @@ u8 acpi_ut_get_resource_type(void *aml)
 *
 * FUNCTION:    acpi_ut_get_resource_length
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
 *
 * RETURN:      Byte Length
 *
@@ -738,7 +738,7 @@ u16 acpi_ut_get_resource_length(void *aml)
 *
 * FUNCTION:    acpi_ut_get_resource_header_length
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
 *
 * RETURN:      Length of the AML header (depends on large/small descriptor)
 *
@@ -763,7 +763,7 @@ u8 acpi_ut_get_resource_header_length(void *aml)
 *
 * FUNCTION:    acpi_ut_get_descriptor_length
 *
- * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ * PARAMETERS:  aml             - Pointer to the raw AML resource descriptor
 *
 * RETURN:      Byte length
 *
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index 4267477c2797..a1c988260073 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -51,8 +51,8 @@ ACPI_MODULE_NAME("utstate")
 *
 * FUNCTION:    acpi_ut_create_pkg_state_and_push
 *
- * PARAMETERS:  Object          - Object to be added to the new state
+ * PARAMETERS:  object          - Object to be added to the new state
- *              Action          - Increment/Decrement
+ *              action          - Increment/Decrement
 *              state_list      - List the state will be added to
 *
 * RETURN:      Status
@@ -85,7 +85,7 @@ acpi_ut_create_pkg_state_and_push(void *internal_object,
 * FUNCTION:    acpi_ut_push_generic_state
 *
 * PARAMETERS:  list_head           - Head of the state stack
- *              State               - State object to push
+ *              state               - State object to push
 *
 * RETURN:      None
 *
@@ -214,8 +214,8 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void)
 *
 * FUNCTION:    acpi_ut_create_update_state
 *
- * PARAMETERS:  Object          - Initial Object to be installed in the state
+ * PARAMETERS:  object          - Initial Object to be installed in the state
- *              Action          - Update action to be performed
+ *              action          - Update action to be performed
 *
 * RETURN:      New state object, null on failure
 *
@@ -252,8 +252,8 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object
 *
 * FUNCTION:    acpi_ut_create_pkg_state
 *
- * PARAMETERS:  Object          - Initial Object to be installed in the state
+ * PARAMETERS:  object          - Initial Object to be installed in the state
- *              Action          - Update action to be performed
+ *              action          - Update action to be performed
 *
 * RETURN:      New state object, null on failure
 *
@@ -325,7 +325,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)
 *
 * FUNCTION:    acpi_ut_delete_generic_state
 *
- * PARAMETERS:  State               - The state object to be deleted
+ * PARAMETERS:  state               - The state object to be deleted
 *
 * RETURN:      None
 *
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index afa94f51ff0b..534179f1177b 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -131,7 +131,7 @@ acpi_status __init acpi_initialize_subsystem(void)
 *
 * FUNCTION:    acpi_enable_subsystem
 *
- * PARAMETERS:  Flags           - Init/enable Options
+ * PARAMETERS:  flags           - Init/enable Options
 *
 * RETURN:      Status
 *
@@ -234,7 +234,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
 *
 * FUNCTION:    acpi_initialize_objects
 *
- * PARAMETERS:  Flags           - Init/enable Options
+ * PARAMETERS:  flags           - Init/enable Options
 *
 * RETURN:      Status
 *
@@ -409,7 +409,7 @@ ACPI_EXPORT_SYMBOL(acpi_subsystem_status)
 * PARAMETERS:  out_buffer      - A buffer to receive the resources for the
 *                                device
 *
- * RETURN:      Status          - the status of the call
+ * RETURN:      status          - the status of the call
 *
 * DESCRIPTION: This function is called to get information about the current
 *              state of the ACPI subsystem.  It will return system information
@@ -480,8 +480,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_system_info)
 *
 * FUNCTION:    acpi_install_initialization_handler
 *
- * PARAMETERS:  Handler             - Callback procedure
+ * PARAMETERS:  handler             - Callback procedure
- *              Function            - Not (currently) used, see below
+ *              function            - Not (currently) used, see below
 *
 * RETURN:      Status
 *
@@ -618,7 +618,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_interface)
 *
 * FUNCTION:    acpi_install_interface_handler
 *
- * PARAMETERS:  Handler             - The _OSI interface handler to install
+ * PARAMETERS:  handler             - The _OSI interface handler to install
 *                                    NULL means "remove existing handler"
 *
 * RETURN:      Status
@@ -651,9 +651,9 @@ ACPI_EXPORT_SYMBOL(acpi_install_interface_handler)
 * FUNCTION:    acpi_check_address_range
 *
 * PARAMETERS:  space_id            - Address space ID
- *              Address             - Start address
+ *              address             - Start address
- *              Length              - Length
+ *              length              - Length
- *              Warn                - TRUE if warning on overlap desired
+ *              warn                - TRUE if warning on overlap desired
 *
 * RETURN:      Count of the number of conflicts detected.
 *
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 52b568af1819..6d63cc39b9ae 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("utxferror")
 * This module is used for the in-kernel ACPICA as well as the ACPICA
 * tools/applications.
 *
- * For the i_aSL compiler case, the output is redirected to stderr so that
+ * For the iASL compiler case, the output is redirected to stderr so that
 * any of the various ACPI errors and warnings do not appear in the output
 * files, for either the compiler or disassembler portions of the tool.
 */
@@ -70,7 +70,7 @@ extern FILE *acpi_gbl_output_file;
 #else
 /*
- * non-i_aSL case - no redirection, nothing to do
+ * non-iASL case - no redirection, nothing to do
 */
 #define ACPI_MSG_REDIRECT_BEGIN
 #define ACPI_MSG_REDIRECT_END
@@ -82,6 +82,8 @@ extern FILE *acpi_gbl_output_file;
 #define ACPI_MSG_EXCEPTION      "ACPI Exception: "
 #define ACPI_MSG_WARNING        "ACPI Warning: "
 #define ACPI_MSG_INFO           "ACPI: "
+#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Bug: Error: "
+#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Bug: Warning: "
 /*
 * Common message suffix
 */
@@ -93,7 +95,7 @@ extern FILE *acpi_gbl_output_file;
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              Format              - Printf format string + additional args
+ *              format              - Printf format string + additional args
 *
 * RETURN:      None
 *
@@ -124,8 +126,8 @@ ACPI_EXPORT_SYMBOL(acpi_error)
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              Status              - Status to be formatted
+ *              status              - Status to be formatted
- *              Format              - Printf format string + additional args
+ *              format              - Printf format string + additional args
 *
 * RETURN:      None
 *
@@ -159,7 +161,7 @@ ACPI_EXPORT_SYMBOL(acpi_exception)
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              Format              - Printf format string + additional args
+ *              format              - Printf format string + additional args
 *
 * RETURN:      None
 *
@@ -190,7 +192,7 @@ ACPI_EXPORT_SYMBOL(acpi_warning)
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              Format              - Printf format string + additional args
+ *              format              - Printf format string + additional args
 *
 * RETURN:      None
 *
@@ -218,6 +220,72 @@ acpi_info(const char *module_name, u32 line_number, const char *format, ...)
 ACPI_EXPORT_SYMBOL(acpi_info)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_bios_error
+ *
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              format              - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print "ACPI Firmware Error" message with module/line/version
+ *              info
+ *
+ ******************************************************************************/
+void ACPI_INTERNAL_VAR_XFACE
+acpi_bios_error(const char *module_name,
+                u32 line_number, const char *format, ...)
+{
+        va_list arg_list;
+        ACPI_MSG_REDIRECT_BEGIN;
+        acpi_os_printf(ACPI_MSG_BIOS_ERROR);
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+        ACPI_MSG_REDIRECT_END;
+}
+ACPI_EXPORT_SYMBOL(acpi_bios_error)
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_bios_warning
+ *
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              format              - Printf format string + additional args
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print "ACPI Firmware Warning" message with module/line/version
+ *              info
+ *
+ ******************************************************************************/
+void ACPI_INTERNAL_VAR_XFACE
+acpi_bios_warning(const char *module_name,
+                  u32 line_number, const char *format, ...)
+{
+        va_list arg_list;
+        ACPI_MSG_REDIRECT_BEGIN;
+        acpi_os_printf(ACPI_MSG_BIOS_WARNING);
+        va_start(arg_list, format);
+        acpi_os_vprintf(format, arg_list);
+        ACPI_MSG_SUFFIX;
+        va_end(arg_list);
+        ACPI_MSG_REDIRECT_END;
+}
+ACPI_EXPORT_SYMBOL(acpi_bios_warning)
 /*
 * The remainder of this module contains internal error functions that may
 * be configured out.
@@ -271,9 +339,9 @@ acpi_ut_predefined_warning(const char *module_name,
 *
 * PARAMETERS:  module_name     - Caller's module name (for error output)
 *              line_number     - Caller's line number (for error output)
- *              Pathname        - Full pathname to the node
+ *              pathname        - Full pathname to the node
 *              node_flags      - From Namespace node for the method/object
- *              Format          - Printf format string + additional args
+ *              format          - Printf format string + additional args
 *
 * RETURN:      None
 *
@@ -373,9 +441,9 @@ acpi_ut_namespace_error(const char *module_name,
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              Message             - Error message to use on failure
+ *              message             - Error message to use on failure
 *              prefix_node         - Prefix relative to the path
- *              Path                - Path to the node (optional)
+ *              path                - Path to the node (optional)
 *              method_status       - Execution status
 *
 * RETURN:      None
diff --git a/drivers/acpi/acpica/utxfmutex.c b/drivers/acpi/acpica/utxfmutex.c
index 1427d191d15a..0a40a851b354 100644
--- a/drivers/acpi/acpica/utxfmutex.c
+++ b/drivers/acpi/acpica/utxfmutex.c
@@ -58,8 +58,8 @@ acpi_ut_get_mutex_object(acpi_handle handle,
 *
 * FUNCTION:    acpi_ut_get_mutex_object
 *
- * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              Pathname            - Mutex pathname (optional)
+ *              pathname            - Mutex pathname (optional)
 *              ret_obj             - Where the mutex object is returned
 *
 * RETURN:      Status
@@ -118,9 +118,9 @@ acpi_ut_get_mutex_object(acpi_handle handle,
 *
 * FUNCTION:    acpi_acquire_mutex
 *
- * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              Pathname            - Mutex pathname (optional)
+ *              pathname            - Mutex pathname (optional)
- *              Timeout             - Max time to wait for the lock (millisec)
+ *              timeout             - Max time to wait for the lock (millisec)
 *
 * RETURN:      Status
 *
@@ -155,8 +155,8 @@ acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout)
 *
 * FUNCTION:    acpi_release_mutex
 *
- * PARAMETERS:  Handle              - Mutex or prefix handle (optional)
+ * PARAMETERS:  handle              - Mutex or prefix handle (optional)
- *              Pathname            - Mutex pathname (optional)
+ *              pathname            - Mutex pathname (optional)
 *
 * RETURN:      Status
 *
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 6686b1eaf13e..00a783661d0b 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -586,6 +586,11 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
        }
        *access_bit_width = 1UL << (access_size_code + 2);
+        /* Fixup common BIOS bug */
+        if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 &&
+            *access_bit_width < 32)
+                *access_bit_width = 32;
        if ((bit_width + bit_offset) > *access_bit_width) {
                pr_warning(FW_BUG APEI_PFX
                           "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 023f9c8534d0..ff2c876ec412 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -250,6 +250,13 @@ static int acpi_battery_get_property(struct power_supply *psy,
                else
                        val->intval = battery->capacity_now * 1000;
                break;
+        case POWER_SUPPLY_PROP_CAPACITY:
+                if (battery->capacity_now && battery->full_charge_capacity)
+                        val->intval = battery->capacity_now * 100/
+                                        battery->full_charge_capacity;
+                else
+                        val->intval = 0;
+                break;
        case POWER_SUPPLY_PROP_MODEL_NAME:
                val->strval = battery->model_number;
                break;
@@ -276,6 +283,7 @@ static enum power_supply_property charge_battery_props[] = {
        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
        POWER_SUPPLY_PROP_CHARGE_FULL,
        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_CAPACITY,
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,
        POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -292,6 +300,7 @@ static enum power_supply_property energy_battery_props[] = {
        POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
        POWER_SUPPLY_PROP_ENERGY_FULL,
        POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_CAPACITY,
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,
        POWER_SUPPLY_PROP_SERIAL_NUMBER,
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index adceafda9c17..9628652e080c 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -574,6 +574,10 @@ static void acpi_bus_osc_support(void)
        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
 #endif
+#ifdef ACPI_HOTPLUG_OST
+        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_HOTPLUG_OST_SUPPORT;
+#endif
        if (!ghes_disable)
                capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
        if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 45cd03b4630e..1f9f7d7d7bc5 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -158,9 +158,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
        int result;
        int present;
        acpi_status status;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
-        present = is_device_present(handle);
        switch (type) {
        case ACPI_NOTIFY_BUS_CHECK:
@@ -169,32 +167,47 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
                printk(KERN_WARNING "Container driver received %s event\n",
                       (type == ACPI_NOTIFY_BUS_CHECK) ?
                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
+                present = is_device_present(handle);
                status = acpi_bus_get_device(handle, &device);
-                if (present) {
+                if (!present) {
-                        if (ACPI_FAILURE(status) || !device) {
-                                result = container_device_add(&device, handle);
-                                if (!result)
-                                        kobject_uevent(&device->dev.kobj,
-                                                       KOBJ_ONLINE);
-                                else
-                                        printk(KERN_WARNING
-                                               "Failed to add container\n");
-                        }
-                } else {
                        if (ACPI_SUCCESS(status)) {
                                /* device exist and this is a remove request */
+                                device->flags.eject_pending = 1;
                                kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
+                                return;
                        }
+                        break;
+                }
+                if (!ACPI_FAILURE(status) || device)
+                        break;
+                result = container_device_add(&device, handle);
+                if (result) {
+                        printk(KERN_WARNING "Failed to add container\n");
+                        break;
                }
+                kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
+                ost_code = ACPI_OST_SC_SUCCESS;
                break;
        case ACPI_NOTIFY_EJECT_REQUEST:
                if (!acpi_bus_get_device(handle, &device) && device) {
+                        device->flags.eject_pending = 1;
                        kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
+                        return;
                }
                break;
        default:
-                break;
+                /* non-hotplug event; possibly handled by other handler */
+                return;
        }
+        /* Inform firmware that the hotplug operation has completed */
+        (void) acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
        return;
 }
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c3881b2eb8b2..9eaf708f5885 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -891,7 +891,7 @@ static void acpi_os_execute_deferred(struct work_struct *work)
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
        if (dpc->wait)
-                acpi_os_wait_events_complete(NULL);
+                acpi_os_wait_events_complete();
        dpc->function(dpc->context);
        kfree(dpc);
@@ -987,7 +987,7 @@ acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function,
        return __acpi_os_execute(0, function, context, 1);
 }
-void acpi_os_wait_events_complete(void *context)
+void acpi_os_wait_events_complete(void)
 {
        flush_workqueue(kacpid_wq);
        flush_workqueue(kacpi_notify_wq);
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 7048b97853e0..ff8e04f2fab4 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -696,9 +696,9 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
 {
        struct acpi_processor *pr;
        struct acpi_device *device = NULL;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
        int result;
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
        case ACPI_NOTIFY_DEVICE_CHECK:
@@ -710,14 +710,18 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                if (!is_processor_present(handle))
                        break;
-                if (acpi_bus_get_device(handle, &device)) {
+                if (!acpi_bus_get_device(handle, &device))
-                        result = acpi_processor_device_add(handle, &device);
+                        break;
-                        if (result)
-                                printk(KERN_ERR PREFIX
+                result = acpi_processor_device_add(handle, &device);
-                                            "Unable to add the device\n");
+                if (result) {
+                        printk(KERN_ERR PREFIX "Unable to add the device\n");
                        break;
                }
+                ost_code = ACPI_OST_SC_SUCCESS;
                break;
        case ACPI_NOTIFY_EJECT_REQUEST:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "received ACPI_NOTIFY_EJECT_REQUEST\n"));
@@ -731,15 +735,23 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                if (!pr) {
                        printk(KERN_ERR PREFIX
                                    "Driver data is NULL, dropping EJECT\n");
-                        return;
+                        break;
                }
+                /* REVISIT: update when eject is supported */
+                ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
-                break;
+                /* non-hotplug event; possibly handled by other handler */
+                return;
        }
+        /* Inform firmware that the hotplug operation has completed */
+        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
        return;
 }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e589c1985248..ad3730b4038b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -301,16 +301,16 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
        pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5;
        /* determine latencies from FADT */
-        pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.C2latency;
+        pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.c2_latency;
-        pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.C3latency;
+        pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.c3_latency;
        /*
         * FADT specified C2 latency must be less than or equal to
         * 100 microseconds.
         */
-        if (acpi_gbl_FADT.C2latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
+        if (acpi_gbl_FADT.c2_latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "C2 latency too large [%d]\n", acpi_gbl_FADT.C2latency));
+                        "C2 latency too large [%d]\n", acpi_gbl_FADT.c2_latency));
                /* invalidate C2 */
                pr->power.states[ACPI_STATE_C2].address = 0;
        }
@@ -319,9 +319,9 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         * FADT supplied C3 latency must be less than or equal to
         * 1000 microseconds.
         */
-        if (acpi_gbl_FADT.C3latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
+        if (acpi_gbl_FADT.c3_latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "C3 latency too large [%d]\n", acpi_gbl_FADT.C3latency));
+                        "C3 latency too large [%d]\n", acpi_gbl_FADT.c3_latency));
                /* invalidate C3 */
                pr->power.states[ACPI_STATE_C3].address = 0;
        }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index fdda49336560..d1ecca2b641a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -83,19 +83,29 @@ acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
-static void acpi_bus_hot_remove_device(void *context)
+/**
+ * acpi_bus_hot_remove_device: hot-remove a device and its children
+ * @context: struct acpi_eject_event pointer (freed in this func)
+ *
+ * Hot-remove a device and its children. This function frees up the
+ * memory space passed by arg context, so that the caller may call
+ * this function asynchronously through acpi_os_hotplug_execute().
+ */
+void acpi_bus_hot_remove_device(void *context)
 {
+        struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context;
        struct acpi_device *device;
-        acpi_handle handle = context;
+        acpi_handle handle = ej_event->handle;
        struct acpi_object_list arg_list;
        union acpi_object arg;
        acpi_status status = AE_OK;
+        u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
        if (acpi_bus_get_device(handle, &device))
-                return;
+                goto err_out;
        if (!device)
-                return;
+                goto err_out;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                "Hot-removing device %s...\n", dev_name(&device->dev)));
@@ -103,7 +113,7 @@ static void acpi_bus_hot_remove_device(void *context)
        if (acpi_bus_trim(device, 1)) {
                printk(KERN_ERR PREFIX
                                "Removing device failed\n");
-                return;
+                goto err_out;
        }
        /* power off device */
@@ -129,10 +139,21 @@ static void acpi_bus_hot_remove_device(void *context)
         * TBD: _EJD support.
         */
        status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
-                printk(KERN_WARNING PREFIX
+                if (status != AE_NOT_FOUND)
-                                "Eject device failed\n");
+                        printk(KERN_WARNING PREFIX
+                                        "Eject device failed\n");
+                goto err_out;
+        }
+        kfree(context);
+        return;
+err_out:
+        /* Inform firmware the hot-remove operation has completed w/ error */
+        (void) acpi_evaluate_hotplug_ost(handle,
+                                ej_event->event, ost_code, NULL);
+        kfree(context);
        return;
 }
@@ -144,6 +165,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
        acpi_status status;
        acpi_object_type type = 0;
        struct acpi_device *acpi_device = to_acpi_device(d);
+        struct acpi_eject_event *ej_event;
        if ((!count) || (buf[0] != '1')) {
                return -EINVAL;
@@ -160,7 +182,25 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
                goto err;
        }
-        acpi_os_hotplug_execute(acpi_bus_hot_remove_device, acpi_device->handle);
+        ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
+        if (!ej_event) {
+                ret = -ENOMEM;
+                goto err;
+        }
+        ej_event->handle = acpi_device->handle;
+        if (acpi_device->flags.eject_pending) {
+                /* event originated from ACPI eject notification */
+                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
+                acpi_device->flags.eject_pending = 0;
+        } else {
+                /* event originated from user */
+                ej_event->event = ACPI_OST_EC_OSPM_EJECT;
+                (void) acpi_evaluate_hotplug_ost(ej_event->handle,
+                        ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+        }
+        acpi_os_hotplug_execute(acpi_bus_hot_remove_device, (void *)ej_event);
 err:
        return ret;
 }
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 028dd425702c..7a7a9c929247 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -143,7 +143,7 @@ void __init acpi_old_suspend_ordering(void)
 static int acpi_pm_freeze(void)
 {
        acpi_disable_all_gpes();
-        acpi_os_wait_events_complete(NULL);
+        acpi_os_wait_events_complete();
        acpi_ec_block_transactions();
        return 0;
 }
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 21dd4c268aef..9fe90e9fecb5 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -552,8 +552,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal,
        return 0;
 }
-static const char enabled[] = "kernel";
-static const char disabled[] = "user";
 static int thermal_get_mode(struct thermal_zone_device *thermal,
                                enum thermal_device_mode *mode)
 {
@@ -590,8 +588,8 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,
        if (enable != tz->tz_enabled) {
                tz->tz_enabled = enable;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "%s ACPI thermal control\n",
+                        "%s kernel ACPI thermal control\n",
-                        tz->tz_enabled ? enabled : disabled));
+                        tz->tz_enabled ? "Enable" : "Disable"));
                acpi_thermal_check(tz);
        }
        return 0;
@@ -847,7 +845,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
        if (tz->trips.passive.flags.valid)
                tz->thermal_zone =
-                        thermal_zone_device_register("acpitz", trips, tz,
+                        thermal_zone_device_register("acpitz", trips, 0, tz,
                                                     &acpi_thermal_zone_ops,
                                                     tz->trips.passive.tc1,
                                                     tz->trips.passive.tc2,
@@ -855,7 +853,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
                                                     tz->polling_frequency*100);
        else
                tz->thermal_zone =
-                        thermal_zone_device_register("acpitz", trips, tz,
+                        thermal_zone_device_register("acpitz", trips, 0, tz,
                                                     &acpi_thermal_zone_ops,
                                                     0, 0, 0,
                                                     tz->polling_frequency*100);
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index adbbc1c80a26..3e87c9c538aa 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -412,3 +412,45 @@ out:
        return status;
 }
 EXPORT_SYMBOL(acpi_get_physical_device_location);
+/**
+ * acpi_evaluate_hotplug_ost: Evaluate _OST for hotplug operations
+ * @handle: ACPI device handle
+ * @source_event: source event code
+ * @status_code: status code
+ * @status_buf: optional detailed information (NULL if none)
+ *
+ * Evaluate _OST for hotplug operations. All ACPI hotplug handlers
+ * must call this function when evaluating _OST for hotplug operations.
+ * When the platform does not support _OST, this function has no effect.
+ */
+acpi_status
+acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
+                u32 status_code, struct acpi_buffer *status_buf)
+{
+#ifdef ACPI_HOTPLUG_OST
+        union acpi_object params[3] = {
+                {.type = ACPI_TYPE_INTEGER,},
+                {.type = ACPI_TYPE_INTEGER,},
+                {.type = ACPI_TYPE_BUFFER,}
+        };
+        struct acpi_object_list arg_list = {3, params};
+        acpi_status status;
+        params[0].integer.value = source_event;
+        params[1].integer.value = status_code;
+        if (status_buf != NULL) {
+                params[2].buffer.pointer = status_buf->pointer;
+                params[2].buffer.length = status_buf->length;
+        } else {
+                params[2].buffer.pointer = NULL;
+                params[2].buffer.length = 0;
+        }
+        status = acpi_evaluate_object(handle, "_OST", &arg_list, NULL);
+        return status;
+#else
+        return AE_OK;
+#endif
+}
+EXPORT_SYMBOL(acpi_evaluate_hotplug_ost);
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index 78a666d1e5f5..a76b689e553b 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -18,3 +18,6 @@ config CPU_IDLE_GOV_MENU
        bool
        depends on CPU_IDLE && NO_HZ
        default y
+config ARCH_NEEDS_CPU_IDLE_COUPLED
+        def_bool n
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 5634f88379df..38c8f69f30cf 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -3,3 +3,4 @@
 #
 obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
+obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
new file mode 100644
index 000000000000..2c9bf2692232
--- /dev/null
+++ b/drivers/cpuidle/coupled.c
@@ -0,0 +1,715 @@
+/*
+ * coupled.c - helper functions to enter the same idle state on multiple cpus
+ *
+ * Copyright (c) 2011 Google, Inc.
+ *
+ * Author: Colin Cross <ccross@android.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+#include <linux/kernel.h>
+#include <linux/cpu.h>
+#include <linux/cpuidle.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include "cpuidle.h"
+/**
+ * DOC: Coupled cpuidle states
+ *
+ * On some ARM SMP SoCs (OMAP4460, Tegra 2, and probably more), the
+ * cpus cannot be independently powered down, either due to
+ * sequencing restrictions (on Tegra 2, cpu 0 must be the last to
+ * power down), or due to HW bugs (on OMAP4460, a cpu powering up
+ * will corrupt the gic state unless the other cpu runs a work
+ * around).  Each cpu has a power state that it can enter without
+ * coordinating with the other cpu (usually Wait For Interrupt, or
+ * WFI), and one or more "coupled" power states that affect blocks
+ * shared between the cpus (L2 cache, interrupt controller, and
+ * sometimes the whole SoC).  Entering a coupled power state must
+ * be tightly controlled on both cpus.
+ *
+ * This file implements a solution, where each cpu will wait in the
+ * WFI state until all cpus are ready to enter a coupled state, at
+ * which point the coupled state function will be called on all
+ * cpus at approximately the same time.
+ *
+ * Once all cpus are ready to enter idle, they are woken by an smp
+ * cross call.  At this point, there is a chance that one of the
+ * cpus will find work to do, and choose not to enter idle.  A
+ * final pass is needed to guarantee that all cpus will call the
+ * power state enter function at the same time.  During this pass,
+ * each cpu will increment the ready counter, and continue once the
+ * ready counter matches the number of online coupled cpus.  If any
+ * cpu exits idle, the other cpus will decrement their counter and
+ * retry.
+ *
+ * requested_state stores the deepest coupled idle state each cpu
+ * is ready for.  It is assumed that the states are indexed from
+ * shallowest (highest power, lowest exit latency) to deepest
+ * (lowest power, highest exit latency).  The requested_state
+ * variable is not locked.  It is only written from the cpu that
+ * it stores (or by the on/offlining cpu if that cpu is offline),
+ * and only read after all the cpus are ready for the coupled idle
+ * state are are no longer updating it.
+ *
+ * Three atomic counters are used.  alive_count tracks the number
+ * of cpus in the coupled set that are currently or soon will be
+ * online.  waiting_count tracks the number of cpus that are in
+ * the waiting loop, in the ready loop, or in the coupled idle state.
+ * ready_count tracks the number of cpus that are in the ready loop
+ * or in the coupled idle state.
+ *
+ * To use coupled cpuidle states, a cpuidle driver must:
+ *
+ *    Set struct cpuidle_device.coupled_cpus to the mask of all
+ *    coupled cpus, usually the same as cpu_possible_mask if all cpus
+ *    are part of the same cluster.  The coupled_cpus mask must be
+ *    set in the struct cpuidle_device for each cpu.
+ *
+ *    Set struct cpuidle_device.safe_state to a state that is not a
+ *    coupled state.  This is usually WFI.
+ *
+ *    Set CPUIDLE_FLAG_COUPLED in struct cpuidle_state.flags for each
+ *    state that affects multiple cpus.
+ *
+ *    Provide a struct cpuidle_state.enter function for each state
+ *    that affects multiple cpus.  This function is guaranteed to be
+ *    called on all cpus at approximately the same time.  The driver
+ *    should ensure that the cpus all abort together if any cpu tries
+ *    to abort once the function is called.  The function should return
+ *    with interrupts still disabled.
+ */
+/**
+ * struct cpuidle_coupled - data for set of cpus that share a coupled idle state
+ * @coupled_cpus: mask of cpus that are part of the coupled set
+ * @requested_state: array of requested states for cpus in the coupled set
+ * @ready_waiting_counts: combined count of cpus  in ready or waiting loops
+ * @online_count: count of cpus that are online
+ * @refcnt: reference count of cpuidle devices that are using this struct
+ * @prevent: flag to prevent coupled idle while a cpu is hotplugging
+ */
+struct cpuidle_coupled {
+        cpumask_t coupled_cpus;
+        int requested_state[NR_CPUS];
+        atomic_t ready_waiting_counts;
+        int online_count;
+        int refcnt;
+        int prevent;
+};
+#define WAITING_BITS 16
+#define MAX_WAITING_CPUS (1 << WAITING_BITS)
+#define WAITING_MASK (MAX_WAITING_CPUS - 1)
+#define READY_MASK (~WAITING_MASK)
+#define CPUIDLE_COUPLED_NOT_IDLE        (-1)
+static DEFINE_MUTEX(cpuidle_coupled_lock);
+static DEFINE_PER_CPU(struct call_single_data, cpuidle_coupled_poke_cb);
+/*
+ * The cpuidle_coupled_poked_mask mask is used to avoid calling
+ * __smp_call_function_single with the per cpu call_single_data struct already
+ * in use.  This prevents a deadlock where two cpus are waiting for each others
+ * call_single_data struct to be available
+ */
+static cpumask_t cpuidle_coupled_poked_mask;
+/**
+ * cpuidle_coupled_parallel_barrier - synchronize all online coupled cpus
+ * @dev: cpuidle_device of the calling cpu
+ * @a:   atomic variable to hold the barrier
+ *
+ * No caller to this function will return from this function until all online
+ * cpus in the same coupled group have called this function.  Once any caller
+ * has returned from this function, the barrier is immediately available for
+ * reuse.
+ *
+ * The atomic variable a must be initialized to 0 before any cpu calls
+ * this function, will be reset to 0 before any cpu returns from this function.
+ *
+ * Must only be called from within a coupled idle state handler
+ * (state.enter when state.flags has CPUIDLE_FLAG_COUPLED set).
+ *
+ * Provides full smp barrier semantics before and after calling.
+ */
+void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a)
+{
+        int n = dev->coupled->online_count;
+        smp_mb__before_atomic_inc();
+        atomic_inc(a);
+        while (atomic_read(a) < n)
+                cpu_relax();
+        if (atomic_inc_return(a) == n * 2) {
+                atomic_set(a, 0);
+                return;
+        }
+        while (atomic_read(a) > n)
+                cpu_relax();
+}
+/**
+ * cpuidle_state_is_coupled - check if a state is part of a coupled set
+ * @dev: struct cpuidle_device for the current cpu
+ * @drv: struct cpuidle_driver for the platform
+ * @state: index of the target state in drv->states
+ *
+ * Returns true if the target state is coupled with cpus besides this one
+ */
+bool cpuidle_state_is_coupled(struct cpuidle_device *dev,
+        struct cpuidle_driver *drv, int state)
+{
+        return drv->states[state].flags & CPUIDLE_FLAG_COUPLED;
+}
+/**
+ * cpuidle_coupled_set_ready - mark a cpu as ready
+ * @coupled: the struct coupled that contains the current cpu
+ */
+static inline void cpuidle_coupled_set_ready(struct cpuidle_coupled *coupled)
+{
+        atomic_add(MAX_WAITING_CPUS, &coupled->ready_waiting_counts);
+}
+/**
+ * cpuidle_coupled_set_not_ready - mark a cpu as not ready
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Decrements the ready counter, unless the ready (and thus the waiting) counter
+ * is equal to the number of online cpus.  Prevents a race where one cpu
+ * decrements the waiting counter and then re-increments it just before another
+ * cpu has decremented its ready counter, leading to the ready counter going
+ * down from the number of online cpus without going through the coupled idle
+ * state.
+ *
+ * Returns 0 if the counter was decremented successfully, -EINVAL if the ready
+ * counter was equal to the number of online cpus.
+ */
+static
+inline int cpuidle_coupled_set_not_ready(struct cpuidle_coupled *coupled)
+{
+        int all;
+        int ret;
+        all = coupled->online_count || (coupled->online_count << WAITING_BITS);
+        ret = atomic_add_unless(&coupled->ready_waiting_counts,
+                -MAX_WAITING_CPUS, all);
+        return ret ? 0 : -EINVAL;
+}
+/**
+ * cpuidle_coupled_no_cpus_ready - check if no cpus in a coupled set are ready
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Returns true if all of the cpus in a coupled set are out of the ready loop.
+ */
+static inline int cpuidle_coupled_no_cpus_ready(struct cpuidle_coupled *coupled)
+{
+        int r = atomic_read(&coupled->ready_waiting_counts) >> WAITING_BITS;
+        return r == 0;
+}
+/**
+ * cpuidle_coupled_cpus_ready - check if all cpus in a coupled set are ready
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Returns true if all cpus coupled to this target state are in the ready loop
+ */
+static inline bool cpuidle_coupled_cpus_ready(struct cpuidle_coupled *coupled)
+{
+        int r = atomic_read(&coupled->ready_waiting_counts) >> WAITING_BITS;
+        return r == coupled->online_count;
+}
+/**
+ * cpuidle_coupled_cpus_waiting - check if all cpus in a coupled set are waiting
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Returns true if all cpus coupled to this target state are in the wait loop
+ */
+static inline bool cpuidle_coupled_cpus_waiting(struct cpuidle_coupled *coupled)
+{
+        int w = atomic_read(&coupled->ready_waiting_counts) & WAITING_MASK;
+        return w == coupled->online_count;
+}
+/**
+ * cpuidle_coupled_no_cpus_waiting - check if no cpus in coupled set are waiting
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Returns true if all of the cpus in a coupled set are out of the waiting loop.
+ */
+static inline int cpuidle_coupled_no_cpus_waiting(struct cpuidle_coupled *coupled)
+{
+        int w = atomic_read(&coupled->ready_waiting_counts) & WAITING_MASK;
+        return w == 0;
+}
+/**
+ * cpuidle_coupled_get_state - determine the deepest idle state
+ * @dev: struct cpuidle_device for this cpu
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Returns the deepest idle state that all coupled cpus can enter
+ */
+static inline int cpuidle_coupled_get_state(struct cpuidle_device *dev,
+                struct cpuidle_coupled *coupled)
+{
+        int i;
+        int state = INT_MAX;
+        /*
+         * Read barrier ensures that read of requested_state is ordered after
+         * reads of ready_count.  Matches the write barriers
+         * cpuidle_set_state_waiting.
+         */
+        smp_rmb();
+        for_each_cpu_mask(i, coupled->coupled_cpus)
+                if (cpu_online(i) && coupled->requested_state[i] < state)
+                        state = coupled->requested_state[i];
+        return state;
+}
+static void cpuidle_coupled_poked(void *info)
+{
+        int cpu = (unsigned long)info;
+        cpumask_clear_cpu(cpu, &cpuidle_coupled_poked_mask);
+}
+/**
+ * cpuidle_coupled_poke - wake up a cpu that may be waiting
+ * @cpu: target cpu
+ *
+ * Ensures that the target cpu exits it's waiting idle state (if it is in it)
+ * and will see updates to waiting_count before it re-enters it's waiting idle
+ * state.
+ *
+ * If cpuidle_coupled_poked_mask is already set for the target cpu, that cpu
+ * either has or will soon have a pending IPI that will wake it out of idle,
+ * or it is currently processing the IPI and is not in idle.
+ */
+static void cpuidle_coupled_poke(int cpu)
+{
+        struct call_single_data *csd = &per_cpu(cpuidle_coupled_poke_cb, cpu);
+        if (!cpumask_test_and_set_cpu(cpu, &cpuidle_coupled_poked_mask))
+                __smp_call_function_single(cpu, csd, 0);
+}
+/**
+ * cpuidle_coupled_poke_others - wake up all other cpus that may be waiting
+ * @dev: struct cpuidle_device for this cpu
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Calls cpuidle_coupled_poke on all other online cpus.
+ */
+static void cpuidle_coupled_poke_others(int this_cpu,
+                struct cpuidle_coupled *coupled)
+{
+        int cpu;
+        for_each_cpu_mask(cpu, coupled->coupled_cpus)
+                if (cpu != this_cpu && cpu_online(cpu))
+                        cpuidle_coupled_poke(cpu);
+}
+/**
+ * cpuidle_coupled_set_waiting - mark this cpu as in the wait loop
+ * @dev: struct cpuidle_device for this cpu
+ * @coupled: the struct coupled that contains the current cpu
+ * @next_state: the index in drv->states of the requested state for this cpu
+ *
+ * Updates the requested idle state for the specified cpuidle device,
+ * poking all coupled cpus out of idle if necessary to let them see the new
+ * state.
+ */
+static void cpuidle_coupled_set_waiting(int cpu,
+                struct cpuidle_coupled *coupled, int next_state)
+{
+        int w;
+        coupled->requested_state[cpu] = next_state;
+        /*
+         * If this is the last cpu to enter the waiting state, poke
+         * all the other cpus out of their waiting state so they can
+         * enter a deeper state.  This can race with one of the cpus
+         * exiting the waiting state due to an interrupt and
+         * decrementing waiting_count, see comment below.
+         *
+         * The atomic_inc_return provides a write barrier to order the write
+         * to requested_state with the later write that increments ready_count.
+         */
+        w = atomic_inc_return(&coupled->ready_waiting_counts) & WAITING_MASK;
+        if (w == coupled->online_count)
+                cpuidle_coupled_poke_others(cpu, coupled);
+}
+/**
+ * cpuidle_coupled_set_not_waiting - mark this cpu as leaving the wait loop
+ * @dev: struct cpuidle_device for this cpu
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Removes the requested idle state for the specified cpuidle device.
+ */
+static void cpuidle_coupled_set_not_waiting(int cpu,
+                struct cpuidle_coupled *coupled)
+{
+        /*
+         * Decrementing waiting count can race with incrementing it in
+         * cpuidle_coupled_set_waiting, but that's OK.  Worst case, some
+         * cpus will increment ready_count and then spin until they
+         * notice that this cpu has cleared it's requested_state.
+         */
+        atomic_dec(&coupled->ready_waiting_counts);
+        coupled->requested_state[cpu] = CPUIDLE_COUPLED_NOT_IDLE;
+}
+/**
+ * cpuidle_coupled_set_done - mark this cpu as leaving the ready loop
+ * @cpu: the current cpu
+ * @coupled: the struct coupled that contains the current cpu
+ *
+ * Marks this cpu as no longer in the ready and waiting loops.  Decrements
+ * the waiting count first to prevent another cpu looping back in and seeing
+ * this cpu as waiting just before it exits idle.
+ */
+static void cpuidle_coupled_set_done(int cpu, struct cpuidle_coupled *coupled)
+{
+        cpuidle_coupled_set_not_waiting(cpu, coupled);
+        atomic_sub(MAX_WAITING_CPUS, &coupled->ready_waiting_counts);
+}
+/**
+ * cpuidle_coupled_clear_pokes - spin until the poke interrupt is processed
+ * @cpu - this cpu
+ *
+ * Turns on interrupts and spins until any outstanding poke interrupts have
+ * been processed and the poke bit has been cleared.
+ *
+ * Other interrupts may also be processed while interrupts are enabled, so
+ * need_resched() must be tested after turning interrupts off again to make sure
+ * the interrupt didn't schedule work that should take the cpu out of idle.
+ *
+ * Returns 0 if need_resched was false, -EINTR if need_resched was true.
+ */
+static int cpuidle_coupled_clear_pokes(int cpu)
+{
+        local_irq_enable();
+        while (cpumask_test_cpu(cpu, &cpuidle_coupled_poked_mask))
+                cpu_relax();
+        local_irq_disable();
+        return need_resched() ? -EINTR : 0;
+}
+/**
+ * cpuidle_enter_state_coupled - attempt to enter a state with coupled cpus
+ * @dev: struct cpuidle_device for the current cpu
+ * @drv: struct cpuidle_driver for the platform
+ * @next_state: index of the requested state in drv->states
+ *
+ * Coordinate with coupled cpus to enter the target state.  This is a two
+ * stage process.  In the first stage, the cpus are operating independently,
+ * and may call into cpuidle_enter_state_coupled at completely different times.
+ * To save as much power as possible, the first cpus to call this function will
+ * go to an intermediate state (the cpuidle_device's safe state), and wait for
+ * all the other cpus to call this function.  Once all coupled cpus are idle,
+ * the second stage will start.  Each coupled cpu will spin until all cpus have
+ * guaranteed that they will call the target_state.
+ *
+ * This function must be called with interrupts disabled.  It may enable
+ * interrupts while preparing for idle, and it will always return with
+ * interrupts enabled.
+ */
+int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int next_state)
+{
+        int entered_state = -1;
+        struct cpuidle_coupled *coupled = dev->coupled;
+        if (!coupled)
+                return -EINVAL;
+        while (coupled->prevent) {
+                if (cpuidle_coupled_clear_pokes(dev->cpu)) {
+                        local_irq_enable();
+                        return entered_state;
+                }
+                entered_state = cpuidle_enter_state(dev, drv,
+                        dev->safe_state_index);
+        }
+        /* Read barrier ensures online_count is read after prevent is cleared */
+        smp_rmb();
+        cpuidle_coupled_set_waiting(dev->cpu, coupled, next_state);
+retry:
+        /*
+         * Wait for all coupled cpus to be idle, using the deepest state
+         * allowed for a single cpu.
+         */
+        while (!cpuidle_coupled_cpus_waiting(coupled)) {
+                if (cpuidle_coupled_clear_pokes(dev->cpu)) {
+                        cpuidle_coupled_set_not_waiting(dev->cpu, coupled);
+                        goto out;
+                }
+                if (coupled->prevent) {
+                        cpuidle_coupled_set_not_waiting(dev->cpu, coupled);
+                        goto out;
+                }
+                entered_state = cpuidle_enter_state(dev, drv,
+                        dev->safe_state_index);
+        }
+        if (cpuidle_coupled_clear_pokes(dev->cpu)) {
+                cpuidle_coupled_set_not_waiting(dev->cpu, coupled);
+                goto out;
+        }
+        /*
+         * All coupled cpus are probably idle.  There is a small chance that
+         * one of the other cpus just became active.  Increment the ready count,
+         * and spin until all coupled cpus have incremented the counter. Once a
+         * cpu has incremented the ready counter, it cannot abort idle and must
+         * spin until either all cpus have incremented the ready counter, or
+         * another cpu leaves idle and decrements the waiting counter.
+         */
+        cpuidle_coupled_set_ready(coupled);
+        while (!cpuidle_coupled_cpus_ready(coupled)) {
+                /* Check if any other cpus bailed out of idle. */
+                if (!cpuidle_coupled_cpus_waiting(coupled))
+                        if (!cpuidle_coupled_set_not_ready(coupled))
+                                goto retry;
+                cpu_relax();
+        }
+        /* all cpus have acked the coupled state */
+        next_state = cpuidle_coupled_get_state(dev, coupled);
+        entered_state = cpuidle_enter_state(dev, drv, next_state);
+        cpuidle_coupled_set_done(dev->cpu, coupled);
+out:
+        /*
+         * Normal cpuidle states are expected to return with irqs enabled.
+         * That leads to an inefficiency where a cpu receiving an interrupt
+         * that brings it out of idle will process that interrupt before
+         * exiting the idle enter function and decrementing ready_count.  All
+         * other cpus will need to spin waiting for the cpu that is processing
+         * the interrupt.  If the driver returns with interrupts disabled,
+         * all other cpus will loop back into the safe idle state instead of
+         * spinning, saving power.
+         *
+         * Calling local_irq_enable here allows coupled states to return with
+         * interrupts disabled, but won't cause problems for drivers that
+         * exit with interrupts enabled.
+         */
+        local_irq_enable();
+        /*
+         * Wait until all coupled cpus have exited idle.  There is no risk that
+         * a cpu exits and re-enters the ready state because this cpu has
+         * already decremented its waiting_count.
+         */
+        while (!cpuidle_coupled_no_cpus_ready(coupled))
+                cpu_relax();
+        return entered_state;
+}
+static void cpuidle_coupled_update_online_cpus(struct cpuidle_coupled *coupled)
+{
+        cpumask_t cpus;
+        cpumask_and(&cpus, cpu_online_mask, &coupled->coupled_cpus);
+        coupled->online_count = cpumask_weight(&cpus);
+}
+/**
+ * cpuidle_coupled_register_device - register a coupled cpuidle device
+ * @dev: struct cpuidle_device for the current cpu
+ *
+ * Called from cpuidle_register_device to handle coupled idle init.  Finds the
+ * cpuidle_coupled struct for this set of coupled cpus, or creates one if none
+ * exists yet.
+ */
+int cpuidle_coupled_register_device(struct cpuidle_device *dev)
+{
+        int cpu;
+        struct cpuidle_device *other_dev;
+        struct call_single_data *csd;
+        struct cpuidle_coupled *coupled;
+        if (cpumask_empty(&dev->coupled_cpus))
+                return 0;
+        for_each_cpu_mask(cpu, dev->coupled_cpus) {
+                other_dev = per_cpu(cpuidle_devices, cpu);
+                if (other_dev && other_dev->coupled) {
+                        coupled = other_dev->coupled;
+                        goto have_coupled;
+                }
+        }
+        /* No existing coupled info found, create a new one */
+        coupled = kzalloc(sizeof(struct cpuidle_coupled), GFP_KERNEL);
+        if (!coupled)
+                return -ENOMEM;
+        coupled->coupled_cpus = dev->coupled_cpus;
+have_coupled:
+        dev->coupled = coupled;
+        if (WARN_ON(!cpumask_equal(&dev->coupled_cpus, &coupled->coupled_cpus)))
+                coupled->prevent++;
+        cpuidle_coupled_update_online_cpus(coupled);
+        coupled->refcnt++;
+        csd = &per_cpu(cpuidle_coupled_poke_cb, dev->cpu);
+        csd->func = cpuidle_coupled_poked;
+        csd->info = (void *)(unsigned long)dev->cpu;
+        return 0;
+}
+/**
+ * cpuidle_coupled_unregister_device - unregister a coupled cpuidle device
+ * @dev: struct cpuidle_device for the current cpu
+ *
+ * Called from cpuidle_unregister_device to tear down coupled idle.  Removes the
+ * cpu from the coupled idle set, and frees the cpuidle_coupled_info struct if
+ * this was the last cpu in the set.
+ */
+void cpuidle_coupled_unregister_device(struct cpuidle_device *dev)
+{
+        struct cpuidle_coupled *coupled = dev->coupled;
+        if (cpumask_empty(&dev->coupled_cpus))
+                return;
+        if (--coupled->refcnt)
+                kfree(coupled);
+        dev->coupled = NULL;
+}
+/**
+ * cpuidle_coupled_prevent_idle - prevent cpus from entering a coupled state
+ * @coupled: the struct coupled that contains the cpu that is changing state
+ *
+ * Disables coupled cpuidle on a coupled set of cpus.  Used to ensure that
+ * cpu_online_mask doesn't change while cpus are coordinating coupled idle.
+ */
+static void cpuidle_coupled_prevent_idle(struct cpuidle_coupled *coupled)
+{
+        int cpu = get_cpu();
+        /* Force all cpus out of the waiting loop. */
+        coupled->prevent++;
+        cpuidle_coupled_poke_others(cpu, coupled);
+        put_cpu();
+        while (!cpuidle_coupled_no_cpus_waiting(coupled))
+                cpu_relax();
+}
+/**
+ * cpuidle_coupled_allow_idle - allows cpus to enter a coupled state
+ * @coupled: the struct coupled that contains the cpu that is changing state
+ *
+ * Enables coupled cpuidle on a coupled set of cpus.  Used to ensure that
+ * cpu_online_mask doesn't change while cpus are coordinating coupled idle.
+ */
+static void cpuidle_coupled_allow_idle(struct cpuidle_coupled *coupled)
+{
+        int cpu = get_cpu();
+        /*
+         * Write barrier ensures readers see the new online_count when they
+         * see prevent == 0.
+         */
+        smp_wmb();
+        coupled->prevent--;
+        /* Force cpus out of the prevent loop. */
+        cpuidle_coupled_poke_others(cpu, coupled);
+        put_cpu();
+}
+/**
+ * cpuidle_coupled_cpu_notify - notifier called during hotplug transitions
+ * @nb: notifier block
+ * @action: hotplug transition
+ * @hcpu: target cpu number
+ *
+ * Called when a cpu is brought on or offline using hotplug.  Updates the
+ * coupled cpu set appropriately
+ */
+static int cpuidle_coupled_cpu_notify(struct notifier_block *nb,
+                unsigned long action, void *hcpu)
+{
+        int cpu = (unsigned long)hcpu;
+        struct cpuidle_device *dev;
+        mutex_lock(&cpuidle_lock);
+        dev = per_cpu(cpuidle_devices, cpu);
+        if (!dev->coupled)
+                goto out;
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_UP_PREPARE:
+        case CPU_DOWN_PREPARE:
+                cpuidle_coupled_prevent_idle(dev->coupled);
+                break;
+        case CPU_ONLINE:
+        case CPU_DEAD:
+                cpuidle_coupled_update_online_cpus(dev->coupled);
+                /* Fall through */
+        case CPU_UP_CANCELED:
+        case CPU_DOWN_FAILED:
+                cpuidle_coupled_allow_idle(dev->coupled);
+                break;
+        }
+out:
+        mutex_unlock(&cpuidle_lock);
+        return NOTIFY_OK;
+}
+static struct notifier_block cpuidle_coupled_cpu_notifier = {
+        .notifier_call = cpuidle_coupled_cpu_notify,
+};
+static int __init cpuidle_coupled_init(void)
+{
+        return register_cpu_notifier(&cpuidle_coupled_cpu_notifier);
+}
+core_initcall(cpuidle_coupled_init);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d6a533e68e0f..e28f6ea46f1a 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -92,6 +92,34 @@ int cpuidle_play_dead(void)
 }
 /**
+ * cpuidle_enter_state - enter the state and update stats
+ * @dev: cpuidle device for this cpu
+ * @drv: cpuidle driver for this cpu
+ * @next_state: index into drv->states of the state to enter
+ */
+int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
+                int next_state)
+{
+        int entered_state;
+        entered_state = cpuidle_enter_ops(dev, drv, next_state);
+        if (entered_state >= 0) {
+                /* Update cpuidle counters */
+                /* This can be moved to within driver enter routine
+                 * but that results in multiple copies of same code.
+                 */
+                dev->states_usage[entered_state].time +=
+                                (unsigned long long)dev->last_residency;
+                dev->states_usage[entered_state].usage++;
+        } else {
+                dev->last_residency = 0;
+        }
+        return entered_state;
+}
+/**
 * cpuidle_idle_call - the main idle loop
 *
 * NOTE: no locks or semaphores should be used here
@@ -113,15 +141,6 @@ int cpuidle_idle_call(void)
        if (!dev || !dev->enabled)
                return -EBUSY;
-#if 0
-        /* shows regressions, re-enable for 2.6.29 */
-        /*
-         * run any timers that can be run now, at this point
-         * before calculating the idle duration etc.
-         */
-        hrtimer_peek_ahead_timers();
-#endif
        /* ask the governor for the next state */
        next_state = cpuidle_curr_governor->select(drv, dev);
        if (need_resched()) {
@@ -132,23 +151,15 @@ int cpuidle_idle_call(void)
        trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
        trace_cpu_idle_rcuidle(next_state, dev->cpu);
-        entered_state = cpuidle_enter_ops(dev, drv, next_state);
+        if (cpuidle_state_is_coupled(dev, drv, next_state))
+                entered_state = cpuidle_enter_state_coupled(dev, drv,
+                                                            next_state);
+        else
+                entered_state = cpuidle_enter_state(dev, drv, next_state);
        trace_power_end_rcuidle(dev->cpu);
        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
-        if (entered_state >= 0) {
-                /* Update cpuidle counters */
-                /* This can be moved to within driver enter routine
-                 * but that results in multiple copies of same code.
-                 */
-                dev->states_usage[entered_state].time +=
-                                (unsigned long long)dev->last_residency;
-                dev->states_usage[entered_state].usage++;
-        } else {
-                dev->last_residency = 0;
-        }
        /* give the governor an opportunity to reflect on the outcome */
        if (cpuidle_curr_governor->reflect)
                cpuidle_curr_governor->reflect(dev, entered_state);
@@ -299,6 +310,9 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
        int ret, i;
        struct cpuidle_driver *drv = cpuidle_get_driver();
+        if (!dev)
+                return -EINVAL;
        if (dev->enabled)
                return 0;
        if (!drv || !cpuidle_curr_governor)
@@ -383,8 +397,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
        struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);
        struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
-        if (!dev)
-                return -EINVAL;
        if (!try_module_get(cpuidle_driver->owner))
                return -EINVAL;
@@ -392,13 +404,25 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
        per_cpu(cpuidle_devices, dev->cpu) = dev;
        list_add(&dev->device_list, &cpuidle_detected_devices);
-        if ((ret = cpuidle_add_sysfs(cpu_dev))) {
+        ret = cpuidle_add_sysfs(cpu_dev);
-                module_put(cpuidle_driver->owner);
+        if (ret)
-                return ret;
+                goto err_sysfs;
-        }
+        ret = cpuidle_coupled_register_device(dev);
+        if (ret)
+                goto err_coupled;
        dev->registered = 1;
        return 0;
+err_coupled:
+        cpuidle_remove_sysfs(cpu_dev);
+        wait_for_completion(&dev->kobj_unregister);
+err_sysfs:
+        list_del(&dev->device_list);
+        per_cpu(cpuidle_devices, dev->cpu) = NULL;
+        module_put(cpuidle_driver->owner);
+        return ret;
 }
 /**
@@ -409,6 +433,9 @@ int cpuidle_register_device(struct cpuidle_device *dev)
 {
        int ret;
+        if (!dev)
+                return -EINVAL;
        mutex_lock(&cpuidle_lock);
        if ((ret = __cpuidle_register_device(dev))) {
@@ -448,6 +475,8 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
        wait_for_completion(&dev->kobj_unregister);
        per_cpu(cpuidle_devices, dev->cpu) = NULL;
+        cpuidle_coupled_unregister_device(dev);
        cpuidle_resume_and_unlock();
        module_put(cpuidle_driver->owner);
diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h
index 7db186685c27..76e7f696ad8c 100644
--- a/drivers/cpuidle/cpuidle.h
+++ b/drivers/cpuidle/cpuidle.h
@@ -14,6 +14,8 @@ extern struct list_head cpuidle_detected_devices;
 extern struct mutex cpuidle_lock;
 extern spinlock_t cpuidle_driver_lock;
 extern int cpuidle_disabled(void);
+extern int cpuidle_enter_state(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int next_state);
 /* idle loop */
 extern void cpuidle_install_idle_handler(void);
@@ -30,4 +32,34 @@ extern void cpuidle_remove_state_sysfs(struct cpuidle_device *device);
 extern int cpuidle_add_sysfs(struct device *dev);
 extern void cpuidle_remove_sysfs(struct device *dev);
+#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
+bool cpuidle_state_is_coupled(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int state);
+int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int next_state);
+int cpuidle_coupled_register_device(struct cpuidle_device *dev);
+void cpuidle_coupled_unregister_device(struct cpuidle_device *dev);
+#else
+static inline bool cpuidle_state_is_coupled(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int state)
+{
+        return false;
+}
+static inline int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
+                struct cpuidle_driver *drv, int next_state)
+{
+        return -1;
+}
+static inline int cpuidle_coupled_register_device(struct cpuidle_device *dev)
+{
+        return 0;
+}
+static inline void cpuidle_coupled_unregister_device(struct cpuidle_device *dev)
+{
+}
+#endif
 #endif /* __DRIVER_CPUIDLE_H */
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index fe95d5464a02..f559088869f6 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -170,6 +170,38 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
                .enter = &intel_idle },
 };
+static struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = {
+        { /* MWAIT C0 */ },
+        { /* MWAIT C1 */
+                .name = "C1-IVB",
+                .desc = "MWAIT 0x00",
+                .flags = CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 1,
+                .target_residency = 1,
+                .enter = &intel_idle },
+        { /* MWAIT C2 */
+                .name = "C3-IVB",
+                .desc = "MWAIT 0x10",
+                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 59,
+                .target_residency = 156,
+                .enter = &intel_idle },
+        { /* MWAIT C3 */
+                .name = "C6-IVB",
+                .desc = "MWAIT 0x20",
+                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 80,
+                .target_residency = 300,
+                .enter = &intel_idle },
+        { /* MWAIT C4 */
+                .name = "C7-IVB",
+                .desc = "MWAIT 0x30",
+                .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 87,
+                .target_residency = 300,
+                .enter = &intel_idle },
+};
 static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
        { /* MWAIT C0 */ },
        { /* MWAIT C1 */
@@ -361,6 +393,10 @@ static const struct idle_cpu idle_cpu_snb = {
        .state_table = snb_cstates,
 };
+static const struct idle_cpu idle_cpu_ivb = {
+        .state_table = ivb_cstates,
+};
 #define ICPU(model, cpu) \
        { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&cpu }
@@ -376,6 +412,7 @@ static const struct x86_cpu_id intel_idle_ids[] = {
        ICPU(0x2f, idle_cpu_nehalem),
        ICPU(0x2a, idle_cpu_snb),
        ICPU(0x2d, idle_cpu_snb),
+        ICPU(0x3a, idle_cpu_ivb),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 2fd9d36acd15..39abb150bdd4 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -660,7 +660,7 @@ static int acerhdf_register_thermal(void)
        if (IS_ERR(cl_dev))
                return -EINVAL;
-        thz_dev = thermal_zone_device_register("acerhdf", 1, NULL,
+        thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,
                                              &acerhdf_dev_ops, 0, 0, 0,
                                              (kernelmode) ? interval*1000 : 0);
        if (IS_ERR(thz_dev))
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index ea7422f6fa03..3a27113deda9 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev)
                        goto err;
                }
                pinfo->tzd[i] = thermal_zone_device_register(name[i],
-                                0, td_info, &tzd_ops, 0, 0, 0, 0);
+                                0, 0, td_info, &tzd_ops, 0, 0, 0, 0);
                if (IS_ERR(pinfo->tzd[i])) {
                        kfree(td_info);
                        ret = PTR_ERR(pinfo->tzd[i]);
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 514a691abea0..3ab2bd540b54 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -23,6 +23,7 @@ config SPEAR_THERMAL
        bool "SPEAr thermal sensor driver"
        depends on THERMAL
        depends on PLAT_SPEAR
+        depends on OF
        help
          Enable this to plug the SPEAr thermal sensor driver into the Linux
          thermal framework
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index c2e32df3b164..5f8ee39f2000 100644
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -20,9 +20,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/of.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/spear_thermal.h>
 #include <linux/thermal.h>
 #define MD_FACTOR       1000
@@ -103,21 +103,20 @@ static int spear_thermal_probe(struct platform_device *pdev)
 {
        struct thermal_zone_device *spear_thermal = NULL;
        struct spear_thermal_dev *stdev;
-        struct spear_thermal_pdata *pdata;
+        struct device_node *np = pdev->dev.of_node;
-        int ret = 0;
        struct resource *stres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        int ret = 0, val;
+        if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
+                dev_err(&pdev->dev, "Failed: DT Pdata not passed\n");
+                return -EINVAL;
+        }
        if (!stres) {
                dev_err(&pdev->dev, "memory resource missing\n");
                return -ENODEV;
        }
-        pdata = dev_get_platdata(&pdev->dev);
-        if (!pdata) {
-                dev_err(&pdev->dev, "platform data is NULL\n");
-                return -EINVAL;
-        }
        stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
        if (!stdev) {
                dev_err(&pdev->dev, "kzalloc fail\n");
@@ -144,10 +143,10 @@ static int spear_thermal_probe(struct platform_device *pdev)
                goto put_clk;
        }
-        stdev->flags = pdata->thermal_flags;
+        stdev->flags = val;
        writel_relaxed(stdev->flags, stdev->thermal_base);
-        spear_thermal = thermal_zone_device_register("spear_thermal", 0,
+        spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
                                stdev, &ops, 0, 0, 0, 0);
        if (IS_ERR(spear_thermal)) {
                dev_err(&pdev->dev, "thermal zone device is NULL\n");
@@ -189,6 +188,12 @@ static int spear_thermal_exit(struct platform_device *pdev)
        return 0;
 }
+static const struct of_device_id spear_thermal_id_table[] = {
+        { .compatible = "st,thermal-spear1340" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, spear_thermal_id_table);
 static struct platform_driver spear_thermal_driver = {
        .probe = spear_thermal_probe,
        .remove = spear_thermal_exit,
@@ -196,6 +201,7 @@ static struct platform_driver spear_thermal_driver = {
                .name = "spear_thermal",
                .owner = THIS_MODULE,
                .pm = &spear_thermal_pm_ops,
+                .of_match_table = of_match_ptr(spear_thermal_id_table),
        },
 };
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 022bacb71a7e..2d7a9fe8f365 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -196,6 +196,28 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
 }
 static ssize_t
+trip_point_temp_store(struct device *dev, struct device_attribute *attr,
+                     const char *buf, size_t count)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+        if (!tz->ops->set_trip_temp)
+                return -EPERM;
+        if (!sscanf(attr->attr.name, "trip_point_%d_temp", &trip))
+                return -EINVAL;
+        if (kstrtoul(buf, 10, &temperature))
+                return -EINVAL;
+        ret = tz->ops->set_trip_temp(tz, trip, temperature);
+        return ret ? ret : count;
+}
+static ssize_t
 trip_point_temp_show(struct device *dev, struct device_attribute *attr,
                     char *buf)
 {
@@ -218,6 +240,52 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
 }
 static ssize_t
+trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+        if (!tz->ops->set_trip_hyst)
+                return -EPERM;
+        if (!sscanf(attr->attr.name, "trip_point_%d_hyst", &trip))
+                return -EINVAL;
+        if (kstrtoul(buf, 10, &temperature))
+                return -EINVAL;
+        /*
+         * We are not doing any check on the 'temperature' value
+         * here. The driver implementing 'set_trip_hyst' has to
+         * take care of this.
+         */
+        ret = tz->ops->set_trip_hyst(tz, trip, temperature);
+        return ret ? ret : count;
+}
+static ssize_t
+trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+        if (!tz->ops->get_trip_hyst)
+                return -EPERM;
+        if (!sscanf(attr->attr.name, "trip_point_%d_hyst", &trip))
+                return -EINVAL;
+        ret = tz->ops->get_trip_hyst(tz, trip, &temperature);
+        return ret ? ret : sprintf(buf, "%ld\n", temperature);
+}
+static ssize_t
 passive_store(struct device *dev, struct device_attribute *attr,
                    const char *buf, size_t count)
 {
@@ -283,33 +351,6 @@ static DEVICE_ATTR(temp, 0444, temp_show, NULL);
 static DEVICE_ATTR(mode, 0644, mode_show, mode_store);
 static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store);
-static struct device_attribute trip_point_attrs[] = {
-        __ATTR(trip_point_0_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_0_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_1_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_1_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_2_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_2_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_3_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_3_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_4_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_4_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_5_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_5_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_6_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_6_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_7_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_7_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_8_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_10_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_10_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_11_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL),
-};
 /* sys I/F for cooling device */
 #define to_cooling_device(_dev) \
        container_of(_dev, struct thermal_cooling_device, device)
@@ -1089,9 +1130,113 @@ leave:
 EXPORT_SYMBOL(thermal_zone_device_update);
 /**
+ * create_trip_attrs - create attributes for trip points
+ * @tz:         the thermal zone device
+ * @mask:       Writeable trip point bitmap.
+ */
+static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
+{
+        int indx;
+        int size = sizeof(struct thermal_attr) * tz->trips;
+        tz->trip_type_attrs = kzalloc(size, GFP_KERNEL);
+        if (!tz->trip_type_attrs)
+                return -ENOMEM;
+        tz->trip_temp_attrs = kzalloc(size, GFP_KERNEL);
+        if (!tz->trip_temp_attrs) {
+                kfree(tz->trip_type_attrs);
+                return -ENOMEM;
+        }
+        if (tz->ops->get_trip_hyst) {
+                tz->trip_hyst_attrs = kzalloc(size, GFP_KERNEL);
+                if (!tz->trip_hyst_attrs) {
+                        kfree(tz->trip_type_attrs);
+                        kfree(tz->trip_temp_attrs);
+                        return -ENOMEM;
+                }
+        }
+        for (indx = 0; indx < tz->trips; indx++) {
+                /* create trip type attribute */
+                snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_type", indx);
+                sysfs_attr_init(&tz->trip_type_attrs[indx].attr.attr);
+                tz->trip_type_attrs[indx].attr.attr.name =
+                                                tz->trip_type_attrs[indx].name;
+                tz->trip_type_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_type_attrs[indx].attr.show = trip_point_type_show;
+                device_create_file(&tz->device,
+                                   &tz->trip_type_attrs[indx].attr);
+                /* create trip temp attribute */
+                snprintf(tz->trip_temp_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_temp", indx);
+                sysfs_attr_init(&tz->trip_temp_attrs[indx].attr.attr);
+                tz->trip_temp_attrs[indx].attr.attr.name =
+                                                tz->trip_temp_attrs[indx].name;
+                tz->trip_temp_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_temp_attrs[indx].attr.show = trip_point_temp_show;
+                if (mask & (1 << indx)) {
+                        tz->trip_temp_attrs[indx].attr.attr.mode |= S_IWUSR;
+                        tz->trip_temp_attrs[indx].attr.store =
+                                                        trip_point_temp_store;
+                }
+                device_create_file(&tz->device,
+                                   &tz->trip_temp_attrs[indx].attr);
+                /* create Optional trip hyst attribute */
+                if (!tz->ops->get_trip_hyst)
+                        continue;
+                snprintf(tz->trip_hyst_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_hyst", indx);
+                sysfs_attr_init(&tz->trip_hyst_attrs[indx].attr.attr);
+                tz->trip_hyst_attrs[indx].attr.attr.name =
+                                        tz->trip_hyst_attrs[indx].name;
+                tz->trip_hyst_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_hyst_attrs[indx].attr.show = trip_point_hyst_show;
+                if (tz->ops->set_trip_hyst) {
+                        tz->trip_hyst_attrs[indx].attr.attr.mode |= S_IWUSR;
+                        tz->trip_hyst_attrs[indx].attr.store =
+                                        trip_point_hyst_store;
+                }
+                device_create_file(&tz->device,
+                                   &tz->trip_hyst_attrs[indx].attr);
+        }
+        return 0;
+}
+static void remove_trip_attrs(struct thermal_zone_device *tz)
+{
+        int indx;
+        for (indx = 0; indx < tz->trips; indx++) {
+                device_remove_file(&tz->device,
+                                   &tz->trip_type_attrs[indx].attr);
+                device_remove_file(&tz->device,
+                                   &tz->trip_temp_attrs[indx].attr);
+                if (tz->ops->get_trip_hyst)
+                        device_remove_file(&tz->device,
+                                  &tz->trip_hyst_attrs[indx].attr);
+        }
+        kfree(tz->trip_type_attrs);
+        kfree(tz->trip_temp_attrs);
+        kfree(tz->trip_hyst_attrs);
+}
+/**
 * thermal_zone_device_register - register a new thermal zone device
 * @type:       the thermal zone device type
 * @trips:      the number of trip points the thermal zone support
+ * @mask:       a bit string indicating the writeablility of trip points
 * @devdata:    private device data
 * @ops:        standard thermal zone device callbacks
 * @tc1:        thermal coefficient 1 for passive calculations
@@ -1107,7 +1252,7 @@ EXPORT_SYMBOL(thermal_zone_device_update);
 * section 11.1.5.1 of the ACPI specification 3.0.
 */
 struct thermal_zone_device *thermal_zone_device_register(char *type,
-        int trips, void *devdata,
+        int trips, int mask, void *devdata,
        const struct thermal_zone_device_ops *ops,
        int tc1, int tc2, int passive_delay, int polling_delay)
 {
@@ -1121,7 +1266,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
        if (strlen(type) >= THERMAL_NAME_LENGTH)
                return ERR_PTR(-EINVAL);
-        if (trips > THERMAL_MAX_TRIPS || trips < 0)
+        if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips)
                return ERR_PTR(-EINVAL);
        if (!ops || !ops->get_temp)
@@ -1175,15 +1320,11 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
                        goto unregister;
        }
+        result = create_trip_attrs(tz, mask);
+        if (result)
+                goto unregister;
        for (count = 0; count < trips; count++) {
-                result = device_create_file(&tz->device,
-                                            &trip_point_attrs[count * 2]);
-                if (result)
-                        break;
-                result = device_create_file(&tz->device,
-                                            &trip_point_attrs[count * 2 + 1]);
-                if (result)
-                        goto unregister;
                tz->ops->get_trip_type(tz, count, &trip_type);
                if (trip_type == THERMAL_TRIP_PASSIVE)
                        passive = 1;
@@ -1232,7 +1373,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 {
        struct thermal_cooling_device *cdev;
        struct thermal_zone_device *pos = NULL;
-        int count;
        if (!tz)
                return;
@@ -1259,13 +1399,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
        device_remove_file(&tz->device, &dev_attr_temp);
        if (tz->ops->get_mode)
                device_remove_file(&tz->device, &dev_attr_mode);
+        remove_trip_attrs(tz);
-        for (count = 0; count < tz->trips; count++) {
-                device_remove_file(&tz->device,
-                                   &trip_point_attrs[count * 2]);
-                device_remove_file(&tz->device,
-                                   &trip_point_attrs[count * 2 + 1]);
-        }
        thermal_remove_hwmon_sysfs(tz);
        release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
        idr_destroy(&tz->idr);
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 92d6e1d701ff..19503449814f 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@
 #define AE_CODE_ACPI_TABLES             0x2000
 #define AE_CODE_AML                     0x3000
 #define AE_CODE_CONTROL                 0x4000
+#define AE_CODE_MAX                     0x4000
 #define AE_CODE_MASK                    0xF000
 #define ACPI_SUCCESS(a)                 (!(a))
@@ -181,7 +182,7 @@
 /* Exception strings for acpi_format_exception */
-#ifdef DEFINE_ACPI_GLOBALS
+#ifdef ACPI_DEFINE_EXCEPTION_TABLE
 /*
 * String versions of the exception codes above
@@ -295,6 +296,6 @@ char const *acpi_gbl_exception_names_ctrl[] = {
        "AE_CTRL_PARSE_PENDING"
 };
-#endif                          /* ACPI GLOBALS */
+#endif                          /* EXCEPTION_TABLE */
 #endif                          /* __ACEXCEP_H__ */
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index b177f97f53b6..d988ac54f41e 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index d7bd661bfae7..2457ac849655 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -213,6 +213,8 @@
 #define ACPI_WARNING(plist)             acpi_warning plist
 #define ACPI_EXCEPTION(plist)           acpi_exception plist
 #define ACPI_ERROR(plist)               acpi_error plist
+#define ACPI_BIOS_WARNING(plist)        acpi_bios_warning plist
+#define ACPI_BIOS_ERROR(plist)          acpi_bios_error plist
 #define ACPI_DEBUG_OBJECT(obj,l,i)      acpi_ex_do_debug_object(obj,l,i)
 #else
@@ -223,6 +225,8 @@
 #define ACPI_WARNING(plist)
 #define ACPI_EXCEPTION(plist)
 #define ACPI_ERROR(plist)
+#define ACPI_BIOS_WARNING(plist)
+#define ACPI_BIOS_ERROR(plist)
 #define ACPI_DEBUG_OBJECT(obj,l,i)
 #endif                          /* ACPI_NO_ERROR_MESSAGES */
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index de39915f6b7f..c433d5e27679 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 01e2925523ea..bde976ee068d 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -50,6 +50,9 @@ acpi_evaluate_reference(acpi_handle handle,
                        acpi_string pathname,
                        struct acpi_object_list *arguments,
                        struct acpi_handle_list *list);
+acpi_status
+acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
+                        u32 status_code, struct acpi_buffer *status_buf);
 struct acpi_pld {
        unsigned int revision:7; /* 0 */
@@ -174,7 +177,8 @@ struct acpi_device_flags {
        u32 suprise_removal_ok:1;
        u32 power_manageable:1;
        u32 performance_manageable:1;
-        u32 reserved:24;
+        u32 eject_pending:1;
+        u32 reserved:23;
 };
 /* File System */
@@ -326,6 +330,11 @@ struct acpi_bus_event {
        u32 data;
 };
+struct acpi_eject_event {
+        acpi_handle     handle;
+        u32             event;
+};
 extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 void acpi_bus_private_data_handler(acpi_handle, void *);
@@ -363,6 +372,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
 void acpi_bus_unregister_driver(struct acpi_driver *driver);
 int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
                 acpi_handle handle, int type);
+void acpi_bus_hot_remove_device(void *context);
 int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 int acpi_bus_start(struct acpi_device *device);
 acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 21a5548c6686..0650f5fa7ce9 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -8,7 +8,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -205,7 +205,7 @@ acpi_os_execute(acpi_execute_type type,
 acpi_status
 acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
-void acpi_os_wait_events_complete(void *context);
+void acpi_os_wait_events_complete(void);
 void acpi_os_sleep(u64 milliseconds);
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 982110134672..2c744c7a5b3d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20120320
+#define ACPI_CA_VERSION                 0x20120711
 #include "acconfig.h"
 #include "actypes.h"
@@ -154,15 +154,20 @@ void *acpi_callocate(u32 size);
 void acpi_free(void *address);
 /*
- * ACPI table manipulation interfaces
+ * ACPI table load/unload interfaces
 */
-acpi_status acpi_reallocate_root_table(void);
+acpi_status acpi_load_table(struct acpi_table_header *table);
-acpi_status acpi_find_root_pointer(acpi_size *rsdp_address);
+acpi_status acpi_unload_parent_table(acpi_handle object);
 acpi_status acpi_load_tables(void);
-acpi_status acpi_load_table(struct acpi_table_header *table_ptr);
+/*
+ * ACPI table manipulation interfaces
+ */
+acpi_status acpi_reallocate_root_table(void);
+acpi_status acpi_find_root_pointer(acpi_size *rsdp_address);
 acpi_status acpi_unload_table_id(acpi_owner_id id);
@@ -529,6 +534,14 @@ void ACPI_INTERNAL_VAR_XFACE
 acpi_info(const char *module_name,
          u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
+void ACPI_INTERNAL_VAR_XFACE
+acpi_bios_error(const char *module_name,
+                u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
+void ACPI_INTERNAL_VAR_XFACE
+acpi_bios_warning(const char *module_name,
+                  u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
 /*
 * Debug output
 */
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index 3506e39a66b1..40349ae65464 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 * Definitions for Resource Attributes
 */
 typedef u16 acpi_rs_length;     /* Resource Length field is fixed at 16 bits */
-typedef u32 acpi_rsdesc_size;   /* Max Resource Descriptor size is (Length+3) = (64_k-1)+3 */
+typedef u32 acpi_rsdesc_size;   /* Max Resource Descriptor size is (Length+3) = (64K-1)+3 */
 /*
 * Memory Attributes
@@ -332,7 +332,7 @@ struct acpi_resource_address64 {
 };
 struct acpi_resource_extended_address64 {
-        ACPI_RESOURCE_ADDRESS_COMMON u8 revision_iD;
+        ACPI_RESOURCE_ADDRESS_COMMON u8 revision_ID;
        u64 granularity;
        u64 minimum;
        u64 maximum;
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 8dea54665dcf..59a73e1b2845 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -212,7 +212,7 @@ struct acpi_table_fadt {
        u32 smi_command;        /* 32-bit Port address of SMI command port */
        u8 acpi_enable;         /* Value to write to smi_cmd to enable ACPI */
        u8 acpi_disable;        /* Value to write to smi_cmd to disable ACPI */
-        u8 S4bios_request;      /* Value to write to SMI CMD to enter S4BIOS state */
+        u8 s4_bios_request;     /* Value to write to SMI CMD to enter S4BIOS state */
        u8 pstate_control;      /* Processor performance state control */
        u32 pm1a_event_block;   /* 32-bit Port address of Power Mgt 1a Event Reg Blk */
        u32 pm1b_event_block;   /* 32-bit Port address of Power Mgt 1b Event Reg Blk */
@@ -230,8 +230,8 @@ struct acpi_table_fadt {
        u8 gpe1_block_length;   /* Byte Length of ports at gpe1_block */
        u8 gpe1_base;           /* Offset in GPE number space where GPE1 events start */
        u8 cst_control;         /* Support for the _CST object and C States change notification */
-        u16 C2latency;          /* Worst case HW latency to enter/exit C2 state */
+        u16 c2_latency;         /* Worst case HW latency to enter/exit C2 state */
-        u16 C3latency;          /* Worst case HW latency to enter/exit C3 state */
+        u16 c3_latency;         /* Worst case HW latency to enter/exit C3 state */
        u16 flush_size;         /* Processor's memory cache line width, in bytes */
        u16 flush_stride;       /* Number of flush strides that need to be read */
        u8 duty_offset;         /* Processor duty cycle index in processor's P_CNT reg */
@@ -291,7 +291,7 @@ struct acpi_table_fadt {
 #define ACPI_FADT_S4_RTC_VALID      (1<<16)     /* 16: [V4] Contents of RTC_STS valid after S4 wake (ACPI 3.0) */
 #define ACPI_FADT_REMOTE_POWER_ON   (1<<17)     /* 17: [V4] System is compatible with remote power on (ACPI 3.0) */
 #define ACPI_FADT_APIC_CLUSTER      (1<<18)     /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */
-#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */
+#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: [V4] All local xAPICs must use physical dest mode (ACPI 3.0) */
 #define ACPI_FADT_HW_REDUCED        (1<<20)     /* 20: [V5] ACPI hardware is not implemented (ACPI 5.0) */
 #define ACPI_FADT_LOW_POWER_S0      (1<<21)     /* 21: [V5] S0 power savings are equal or better than S3 (ACPI 5.0) */
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 71e747beac8f..300d14e7c5d5 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -676,7 +676,7 @@ struct acpi_madt_local_apic {
 struct acpi_madt_io_apic {
        struct acpi_subtable_header header;
        u8 id;                  /* I/O APIC ID */
-        u8 reserved;            /* Reserved - must be zero */
+        u8 reserved;            /* reserved - must be zero */
        u32 address;            /* APIC physical address */
        u32 global_irq_base;    /* Global system interrupt where INTI lines start */
 };
@@ -794,11 +794,11 @@ struct acpi_madt_generic_interrupt {
 struct acpi_madt_generic_distributor {
        struct acpi_subtable_header header;
-        u16 reserved;           /* Reserved - must be zero */
+        u16 reserved;           /* reserved - must be zero */
        u32 gic_id;
        u64 base_address;
        u32 global_irq_base;
-        u32 reserved2;          /* Reserved - must be zero */
+        u32 reserved2;          /* reserved - must be zero */
 };
 /*
@@ -841,7 +841,7 @@ struct acpi_table_msct {
        u64 max_address;        /* Max physical address in system */
 };
-/* Subtable - Maximum Proximity Domain Information. Version 1 */
+/* subtable - Maximum Proximity Domain Information. Version 1 */
 struct acpi_msct_proximity {
        u8 revision;
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 58bdd0545c5a..d9ceb3d31629 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
 #define ACPI_SIG_DBGP           "DBGP"  /* Debug Port table */
 #define ACPI_SIG_DMAR           "DMAR"  /* DMA Remapping table */
 #define ACPI_SIG_HPET           "HPET"  /* High Precision Event Timer table */
-#define ACPI_SIG_IBFT           "IBFT"  /* i_sCSI Boot Firmware Table */
+#define ACPI_SIG_IBFT           "IBFT"  /* iSCSI Boot Firmware Table */
 #define ACPI_SIG_IVRS           "IVRS"  /* I/O Virtualization Reporting Structure */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
@@ -334,8 +334,8 @@ struct acpi_dmar_reserved_memory {
        struct acpi_dmar_header header;
        u16 reserved;
        u16 segment;
-        u64 base_address;       /* 4_k aligned base address */
+        u64 base_address;       /* 4K aligned base address */
-        u64 end_address;        /* 4_k aligned limit address */
+        u64 end_address;        /* 4K aligned limit address */
 };
 /* Masks for Flags field above */
@@ -565,7 +565,7 @@ struct acpi_ivrs_hardware {
 /* Masks for Info field above */
 #define ACPI_IVHD_MSI_NUMBER_MASK   0x001F      /* 5 bits, MSI message number */
-#define ACPI_IVHD_UNIT_ID_MASK      0x1F00      /* 5 bits, unit_iD */
+#define ACPI_IVHD_UNIT_ID_MASK      0x1F00      /* 5 bits, unit_ID */
 /*
 * Device Entries for IVHD subtable, appear after struct acpi_ivrs_hardware structure.
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index c22ce80e9535..f65a0ed869eb 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index e8bcc4742e0e..3af87de6a68c 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,7 @@ typedef u64 acpi_physical_address;
 * to indicate that special precautions must be taken to avoid alignment faults.
 * (IA64 or ia64 is currently used by existing compilers to indicate IPF.)
 *
- * Note: Em64_t and other X86-64 processors support misaligned transfers,
+ * Note: EM64T and other X86-64 processors support misaligned transfers,
 * so there is no need to define this flag.
 */
 #if defined (__IA64__) || defined (__ia64__)
@@ -636,7 +636,7 @@ typedef u32 acpi_event_type;
 #define ACPI_NUM_FIXED_EVENTS           ACPI_EVENT_MAX + 1
 /*
- * Event Status - Per event
+ * Event status - Per event
 * -------------
 * The encoding of acpi_event_status is illustrated below.
 * Note that a set bit (1) indicates the property is TRUE
@@ -706,10 +706,14 @@ typedef u32 acpi_event_status;
 #define ACPI_DEVICE_NOTIFY              0x2
 #define ACPI_ALL_NOTIFY                 (ACPI_SYSTEM_NOTIFY | ACPI_DEVICE_NOTIFY)
 #define ACPI_MAX_NOTIFY_HANDLER_TYPE    0x3
+#define ACPI_NUM_NOTIFY_TYPES           2
 #define ACPI_MAX_SYS_NOTIFY             0x7F
 #define ACPI_MAX_DEVICE_SPECIFIC_NOTIFY 0xBF
+#define ACPI_SYSTEM_HANDLER_LIST        0       /* Used as index, must be SYSTEM_NOTIFY -1 */
+#define ACPI_DEVICE_HANDLER_LIST        1       /* Used as index, must be DEVICE_NOTIFY -1 */
 /* Address Space (Operation Region) Types */
 typedef u8 acpi_adr_space_type;
@@ -724,8 +728,9 @@ typedef u8 acpi_adr_space_type;
 #define ACPI_ADR_SPACE_IPMI             (acpi_adr_space_type) 7
 #define ACPI_ADR_SPACE_GPIO             (acpi_adr_space_type) 8
 #define ACPI_ADR_SPACE_GSBUS            (acpi_adr_space_type) 9
+#define ACPI_ADR_SPACE_PLATFORM_COMM    (acpi_adr_space_type) 10
-#define ACPI_NUM_PREDEFINED_REGIONS     10
+#define ACPI_NUM_PREDEFINED_REGIONS     11
 /*
 * Special Address Spaces
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 5af3ed52ef98..560a9f272f34 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index e228893591a9..72553b0c9f33 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 6fbc4cab5834..7509be30ca01 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2012, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index f421dd84f29d..b2b4d2ad7103 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -277,7 +277,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
 #define OSC_SB_PAD_SUPPORT              1
 #define OSC_SB_PPC_OST_SUPPORT          2
 #define OSC_SB_PR3_SUPPORT              4
-#define OSC_SB_CPUHP_OST_SUPPORT        8
+#define OSC_SB_HOTPLUG_OST_SUPPORT      8
 #define OSC_SB_APEI_SUPPORT             16
 extern bool osc_sb_apei_support_acked;
@@ -309,6 +309,44 @@ extern bool osc_sb_apei_support_acked;
 extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
                                             u32 *mask, u32 req);
+/* Enable _OST when all relevant hotplug operations are enabled */
+#if defined(CONFIG_ACPI_HOTPLUG_CPU) &&                 \
+        (defined(CONFIG_ACPI_HOTPLUG_MEMORY) ||         \
+         defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
+        (defined(CONFIG_ACPI_CONTAINER) ||              \
+         defined(CONFIG_ACPI_CONTAINER_MODULE))
+#define ACPI_HOTPLUG_OST
+#endif
+/* _OST Source Event Code (OSPM Action) */
+#define ACPI_OST_EC_OSPM_SHUTDOWN               0x100
+#define ACPI_OST_EC_OSPM_EJECT                  0x103
+#define ACPI_OST_EC_OSPM_INSERTION              0x200
+/* _OST General Processing Status Code */
+#define ACPI_OST_SC_SUCCESS                     0x0
+#define ACPI_OST_SC_NON_SPECIFIC_FAILURE        0x1
+#define ACPI_OST_SC_UNRECOGNIZED_NOTIFY         0x2
+/* _OST OS Shutdown Processing (0x100) Status Code */
+#define ACPI_OST_SC_OS_SHUTDOWN_DENIED          0x80
+#define ACPI_OST_SC_OS_SHUTDOWN_IN_PROGRESS     0x81
+#define ACPI_OST_SC_OS_SHUTDOWN_COMPLETED       0x82
+#define ACPI_OST_SC_OS_SHUTDOWN_NOT_SUPPORTED   0x83
+/* _OST Ejection Request (0x3, 0x103) Status Code */
+#define ACPI_OST_SC_EJECT_NOT_SUPPORTED         0x80
+#define ACPI_OST_SC_DEVICE_IN_USE               0x81
+#define ACPI_OST_SC_DEVICE_BUSY                 0x82
+#define ACPI_OST_SC_EJECT_DEPENDENCY_BUSY       0x83
+#define ACPI_OST_SC_EJECT_IN_PROGRESS           0x84
+/* _OST Insertion Request (0x200) Status Code */
+#define ACPI_OST_SC_INSERT_IN_PROGRESS          0x80
+#define ACPI_OST_SC_DRIVER_LOAD_FAILURE         0x81
+#define ACPI_OST_SC_INSERT_NOT_SUPPORTED        0x82
 extern void acpi_early_init(void);
 extern int acpi_nvs_register(__u64 start, __u64 size);
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 89dcd30ac8ea..040b13b5c14a 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -58,6 +58,7 @@ struct cpuidle_state {
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
+#define CPUIDLE_FLAG_COUPLED    (0x02) /* state applies to multiple cpus */
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
@@ -101,6 +102,12 @@ struct cpuidle_device {
        struct list_head        device_list;
        struct kobject          kobj;
        struct completion       kobj_unregister;
+#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
+        int                     safe_state_index;
+        cpumask_t               coupled_cpus;
+        struct cpuidle_coupled  *coupled;
+#endif
 };
 DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
@@ -185,6 +192,10 @@ static inline int cpuidle_play_dead(void) {return -ENODEV; }
 #endif
+#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
+void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a);
+#endif
 /******************************
 * CPUIDLE GOVERNOR INTERFACE *
 ******************************/
diff --git a/include/linux/platform_data/spear_thermal.h b/include/linux/platform_data/spear_thermal.h
deleted file mode 100644
index 724f2e1cbbcb..000000000000
--- a/include/linux/platform_data/spear_thermal.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPEAr thermal driver platform data.
- *
- * Copyright (C) 2011-2012 ST Microelectronics
- * Author: Vincenzo Frascino <vincenzo.frascino@st.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-#ifndef SPEAR_THERMAL_H
-#define SPEAR_THERMAL_H
-/* SPEAr Thermal Sensor Platform Data */
-struct spear_thermal_pdata {
-        /* flags used to enable thermal sensor */
-        unsigned int thermal_flags;
-};
-#endif /* SPEAR_THERMAL_H */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 796f1ff0388c..cfc8d908892e 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -58,6 +58,12 @@ struct thermal_zone_device_ops {
                enum thermal_trip_type *);
        int (*get_trip_temp) (struct thermal_zone_device *, int,
                              unsigned long *);
+        int (*set_trip_temp) (struct thermal_zone_device *, int,
+                              unsigned long);
+        int (*get_trip_hyst) (struct thermal_zone_device *, int,
+                              unsigned long *);
+        int (*set_trip_hyst) (struct thermal_zone_device *, int,
+                              unsigned long);
        int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
        int (*notify) (struct thermal_zone_device *, int,
                       enum thermal_trip_type);
@@ -85,10 +91,18 @@ struct thermal_cooling_device {
                                ((long)t-2732+5)/10 : ((long)t-2732-5)/10)
 #define CELSIUS_TO_KELVIN(t)    ((t)*10+2732)
+struct thermal_attr {
+        struct device_attribute attr;
+        char name[THERMAL_NAME_LENGTH];
+};
 struct thermal_zone_device {
        int id;
        char type[THERMAL_NAME_LENGTH];
        struct device device;
+        struct thermal_attr *trip_temp_attrs;
+        struct thermal_attr *trip_type_attrs;
+        struct thermal_attr *trip_hyst_attrs;
        void *devdata;
        int trips;
        int tc1;
@@ -137,9 +151,9 @@ enum {
 };
 #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
-struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
+struct thermal_zone_device *thermal_zone_device_register(char *, int, int,
-                const struct thermal_zone_device_ops *, int tc1, int tc2,
+                void *, const struct thermal_zone_device_ops *, int tc1,
-                int passive_freq, int polling_freq);
+                int tc2, int passive_freq, int polling_freq);
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index fd8e1f1297aa..f85649554191 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -1,4 +1,5 @@
 turbostat : turbostat.c
+CFLAGS +=       -Wall
 clean :
        rm -f turbostat
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index adf175f61496..74e44507dfe9 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -27,7 +27,11 @@ supports an "invariant" TSC, plus the APERF and MPERF MSRs.
 on processors that additionally support C-state residency counters.
 .SS Options
-The \fB-s\fP option prints only a 1-line summary for each sample interval.
+The \fB-s\fP option limits output to a 1-line system summary for each interval.
+.PP
+The \fB-c\fP option limits output to the 1st thread in each core.
+.PP
+The \fB-p\fP option limits output to the 1st thread in each package.
 .PP
 The \fB-v\fP option increases verbosity.
 .PP
@@ -65,19 +69,19 @@ Subsequent rows show per-CPU statistics.
 .nf
 [root@x980]# ./turbostat
 cor CPU    %c0  GHz  TSC    %c1    %c3    %c6   %pc3   %pc6
-          0.60 1.63 3.38   2.91   0.00  96.49   0.00  76.64
+          0.09 1.62 3.38   1.83   0.32  97.76   1.26  83.61
-  0   0   0.59 1.62 3.38   4.51   0.00  94.90   0.00  76.64
+  0   0   0.15 1.62 3.38  10.23   0.05  89.56   1.26  83.61
-  0   6   1.13 1.64 3.38   3.97   0.00  94.90   0.00  76.64
+  0   6   0.05 1.62 3.38  10.34
-  1   2   0.08 1.62 3.38   0.07   0.00  99.85   0.00  76.64
+  1   2   0.03 1.62 3.38   0.07   0.05  99.86
-  1   8   0.03 1.62 3.38   0.12   0.00  99.85   0.00  76.64
+  1   8   0.03 1.62 3.38   0.06
-  2   4   0.01 1.62 3.38   0.06   0.00  99.93   0.00  76.64
+  2   4   0.21 1.62 3.38   0.10   1.49  98.21
-  2  10   0.04 1.62 3.38   0.02   0.00  99.93   0.00  76.64
+  2  10   0.02 1.62 3.38   0.29
-  8   1   2.85 1.62 3.38  11.71   0.00  85.44   0.00  76.64
+  8   1   0.04 1.62 3.38   0.04   0.08  99.84
-  8   7   1.98 1.62 3.38  12.58   0.00  85.44   0.00  76.64
+  8   7   0.01 1.62 3.38   0.06
-  9   3   0.36 1.62 3.38   0.71   0.00  98.93   0.00  76.64
+  9   3   0.53 1.62 3.38   0.10   0.20  99.17
-  9   9   0.09 1.62 3.38   0.98   0.00  98.93   0.00  76.64
+  9   9   0.02 1.62 3.38   0.60
- 10   5   0.03 1.62 3.38   0.09   0.00  99.87   0.00  76.64
+ 10   5   0.01 1.62 3.38   0.02   0.04  99.92
- 10  11   0.07 1.62 3.38   0.06   0.00  99.87   0.00  76.64
+ 10  11   0.02 1.62 3.38   0.02
 .fi
 .SH SUMMARY EXAMPLE
 The "-s" option prints the column headers just once,
@@ -86,9 +90,10 @@ and then the one line system summary for each sample interval.
 .nf
 [root@x980]# ./turbostat -s
   %c0  GHz  TSC    %c1    %c3    %c6   %pc3   %pc6
-  0.61 1.89 3.38   5.95   0.00  93.44   0.00  66.33
+  0.23 1.67 3.38   2.00   0.30  97.47   1.07  82.12
-  0.52 1.62 3.38   6.83   0.00  92.65   0.00  61.11
+  0.10 1.62 3.38   1.87   2.25  95.77  12.02  72.60
-  0.62 1.92 3.38   5.47   0.00  93.91   0.00  67.31
+  0.20 1.64 3.38   1.98   0.11  97.72   0.30  83.36
+  0.11 1.70 3.38   1.86   1.81  96.22   9.71  74.90
 .fi
 .SH VERBOSE EXAMPLE
 The "-v" option adds verbosity to the output:
@@ -120,30 +125,28 @@ until ^C while the other CPUs are mostly idle:
 [root@x980 lenb]# ./turbostat cat /dev/zero > /dev/null
 ^C
 cor CPU    %c0  GHz  TSC    %c1    %c3    %c6   %pc3   %pc6
-          8.63 3.64 3.38  14.46   0.49  76.42   0.00   0.00
+          8.86 3.61 3.38  15.06  31.19  44.89   0.00   0.00
-  0   0   0.34 3.36 3.38  99.66   0.00   0.00   0.00   0.00
+  0   0   1.46 3.22 3.38  16.84  29.48  52.22   0.00   0.00
-  0   6  99.96 3.64 3.38   0.04   0.00   0.00   0.00   0.00
+  0   6   0.21 3.06 3.38  18.09
-  1   2   0.14 3.50 3.38   1.75   2.04  96.07   0.00   0.00
+  1   2   0.53 3.33 3.38   2.80  46.40  50.27
-  1   8   0.38 3.57 3.38   1.51   2.04  96.07   0.00   0.00
+  1   8   0.89 3.47 3.38   2.44
-  2   4   0.01 2.65 3.38   0.06   0.00  99.93   0.00   0.00
+  2   4   1.36 3.43 3.38   9.04  23.71  65.89
-  2  10   0.03 2.12 3.38   0.04   0.00  99.93   0.00   0.00
+  2  10   0.18 2.86 3.38  10.22
-  8   1   0.91 3.59 3.38  35.27   0.92  62.90   0.00   0.00
+  8   1   0.04 2.87 3.38  99.96   0.01   0.00
-  8   7   1.61 3.63 3.38  34.57   0.92  62.90   0.00   0.00
+  8   7  99.72 3.63 3.38   0.27
-  9   3   0.04 3.38 3.38   0.20   0.00  99.76   0.00   0.00
+  9   3   0.31 3.21 3.38   7.64  56.55  35.50
-  9   9   0.04 3.29 3.38   0.20   0.00  99.76   0.00   0.00
+  9   9   0.08 2.95 3.38   7.88
- 10   5   0.03 3.08 3.38   0.12   0.00  99.85   0.00   0.00
+ 10   5   1.42 3.43 3.38   2.14  30.99  65.44
- 10  11   0.05 3.07 3.38   0.10   0.00  99.85   0.00   0.00
+ 10  11   0.16 2.88 3.38   3.40
-4.907015 sec
 .fi
-Above the cycle soaker drives cpu6 up 3.6 Ghz turbo limit
+Above the cycle soaker drives cpu7 up its 3.6 Ghz turbo limit
 while the other processors are generally in various states of idle.
-Note that cpu0 is an HT sibling sharing core0
+Note that cpu1 and cpu7 are HT siblings within core8.
-with cpu6, and thus it is unable to get to an idle state
+As cpu7 is very busy, it prevents its sibling, cpu1,
-deeper than c1 while cpu6 is busy.
+from entering a c-state deeper than c1.
-Note that turbostat reports average GHz of 3.64, while
+Note that turbostat reports average GHz of 3.63, while
 the arithmetic average of the GHz column above is lower.
 This is a weighted average, where the weight is %c0.  ie. it is the total number of
 un-halted cycles elapsed per time divided by the number of CPUs.
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 16de7ad4850f..861d77190206 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -67,92 +67,119 @@ double bclk;
 unsigned int show_pkg;
 unsigned int show_core;
 unsigned int show_cpu;
+unsigned int show_pkg_only;
+unsigned int show_core_only;
+char *output_buffer, *outp;
 int aperf_mperf_unstable;
 int backwards_count;
 char *progname;
-int num_cpus;
+cpu_set_t *cpu_present_set, *cpu_affinity_set;
-cpu_set_t *cpu_present_set, *cpu_mask;
+size_t cpu_present_setsize, cpu_affinity_setsize;
-size_t cpu_present_setsize, cpu_mask_size;
+struct thread_data {
-struct counters {
+        unsigned long long tsc;
-        unsigned long long tsc;         /* per thread */
+        unsigned long long aperf;
-        unsigned long long aperf;       /* per thread */
+        unsigned long long mperf;
-        unsigned long long mperf;       /* per thread */
+        unsigned long long c1;  /* derived */
-        unsigned long long c1;  /* per thread (calculated) */
+        unsigned long long extra_msr;
-        unsigned long long c3;  /* per core */
+        unsigned int cpu_id;
-        unsigned long long c6;  /* per core */
+        unsigned int flags;
-        unsigned long long c7;  /* per core */
+#define CPU_IS_FIRST_THREAD_IN_CORE     0x2
-        unsigned long long pc2; /* per package */
+#define CPU_IS_FIRST_CORE_IN_PACKAGE    0x4
-        unsigned long long pc3; /* per package */
+} *thread_even, *thread_odd;
-        unsigned long long pc6; /* per package */
-        unsigned long long pc7; /* per package */
+struct core_data {
-        unsigned long long extra_msr;   /* per thread */
+        unsigned long long c3;
-        int pkg;
+        unsigned long long c6;
-        int core;
+        unsigned long long c7;
-        int cpu;
+        unsigned int core_id;
-        struct counters *next;
+} *core_even, *core_odd;
-};
+struct pkg_data {
-struct counters *cnt_even;
+        unsigned long long pc2;
-struct counters *cnt_odd;
+        unsigned long long pc3;
-struct counters *cnt_delta;
+        unsigned long long pc6;
-struct counters *cnt_average;
+        unsigned long long pc7;
-struct timeval tv_even;
+        unsigned int package_id;
-struct timeval tv_odd;
+} *package_even, *package_odd;
-struct timeval tv_delta;
+#define ODD_COUNTERS thread_odd, core_odd, package_odd
-int mark_cpu_present(int pkg, int core, int cpu)
+#define EVEN_COUNTERS thread_even, core_even, package_even
+#define GET_THREAD(thread_base, thread_no, core_no, pkg_no) \
+        (thread_base + (pkg_no) * topo.num_cores_per_pkg * \
+                topo.num_threads_per_core + \
+                (core_no) * topo.num_threads_per_core + (thread_no))
+#define GET_CORE(core_base, core_no, pkg_no) \
+        (core_base + (pkg_no) * topo.num_cores_per_pkg + (core_no))
+#define GET_PKG(pkg_base, pkg_no) (pkg_base + pkg_no)
+struct system_summary {
+        struct thread_data threads;
+        struct core_data cores;
+        struct pkg_data packages;
+} sum, average;
+struct topo_params {
+        int num_packages;
+        int num_cpus;
+        int num_cores;
+        int max_cpu_num;
+        int num_cores_per_pkg;
+        int num_threads_per_core;
+} topo;
+struct timeval tv_even, tv_odd, tv_delta;
+void setup_all_buffers(void);
+int cpu_is_not_present(int cpu)
 {
-        CPU_SET_S(cpu, cpu_present_setsize, cpu_present_set);
+        return !CPU_ISSET_S(cpu, cpu_present_setsize, cpu_present_set);
-        return 0;
 }
 /*
- * cpu_mask_init(ncpus)
+ * run func(thread, core, package) in topology order
- *
+ * skip non-present cpus
- * allocate and clear cpu_mask
- * set cpu_mask_size
 */
-void cpu_mask_init(int ncpus)
+int for_all_cpus(int (func)(struct thread_data *, struct core_data *, struct pkg_data *),
+        struct thread_data *thread_base, struct core_data *core_base, struct pkg_data *pkg_base)
 {
-        cpu_mask = CPU_ALLOC(ncpus);
+        int retval, pkg_no, core_no, thread_no;
-        if (cpu_mask == NULL) {
-                perror("CPU_ALLOC");
-                exit(3);
-        }
-        cpu_mask_size = CPU_ALLOC_SIZE(ncpus);
-        CPU_ZERO_S(cpu_mask_size, cpu_mask);
-        /*
+        for (pkg_no = 0; pkg_no < topo.num_packages; ++pkg_no) {
-         * Allocate and initialize cpu_present_set
+                for (core_no = 0; core_no < topo.num_cores_per_pkg; ++core_no) {
-         */
+                        for (thread_no = 0; thread_no <
-        cpu_present_set = CPU_ALLOC(ncpus);
+                                topo.num_threads_per_core; ++thread_no) {
-        if (cpu_present_set == NULL) {
+                                struct thread_data *t;
-                perror("CPU_ALLOC");
+                                struct core_data *c;
-                exit(3);
+                                struct pkg_data *p;
-        }
-        cpu_present_setsize = CPU_ALLOC_SIZE(ncpus);
-        CPU_ZERO_S(cpu_present_setsize, cpu_present_set);
-        for_all_cpus(mark_cpu_present);
-}
-void cpu_mask_uninit()
+                                t = GET_THREAD(thread_base, thread_no, core_no, pkg_no);
-{
-        CPU_FREE(cpu_mask);
+                                if (cpu_is_not_present(t->cpu_id))
-        cpu_mask = NULL;
+                                        continue;
-        cpu_mask_size = 0;
-        CPU_FREE(cpu_present_set);
+                                c = GET_CORE(core_base, core_no, pkg_no);
-        cpu_present_set = NULL;
+                                p = GET_PKG(pkg_base, pkg_no);
-        cpu_present_setsize = 0;
+                                retval = func(t, c, p);
+                                if (retval)
+                                        return retval;
+                        }
+                }
+        }
+        return 0;
 }
 int cpu_migrate(int cpu)
 {
-        CPU_ZERO_S(cpu_mask_size, cpu_mask);
+        CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set);
-        CPU_SET_S(cpu, cpu_mask_size, cpu_mask);
+        CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set);
-        if (sched_setaffinity(0, cpu_mask_size, cpu_mask) == -1)
+        if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1)
                return -1;
        else
                return 0;
@@ -181,67 +208,72 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
 void print_header(void)
 {
        if (show_pkg)
-                fprintf(stderr, "pk");
+                outp += sprintf(outp, "pk");
        if (show_pkg)
-                fprintf(stderr, " ");
+                outp += sprintf(outp, " ");
        if (show_core)
-                fprintf(stderr, "cor");
+                outp += sprintf(outp, "cor");
        if (show_cpu)
-                fprintf(stderr, " CPU");
+                outp += sprintf(outp, " CPU");
        if (show_pkg || show_core || show_cpu)
-                fprintf(stderr, " ");
+                outp += sprintf(outp, " ");
        if (do_nhm_cstates)
-                fprintf(stderr, "   %%c0");
+                outp += sprintf(outp, "   %%c0");
        if (has_aperf)
-                fprintf(stderr, "  GHz");
+                outp += sprintf(outp, "  GHz");
-        fprintf(stderr, "  TSC");
+        outp += sprintf(outp, "  TSC");
        if (do_nhm_cstates)
-                fprintf(stderr, "    %%c1");
+                outp += sprintf(outp, "    %%c1");
        if (do_nhm_cstates)
-                fprintf(stderr, "    %%c3");
+                outp += sprintf(outp, "    %%c3");
        if (do_nhm_cstates)
-                fprintf(stderr, "    %%c6");
+                outp += sprintf(outp, "    %%c6");
        if (do_snb_cstates)
-                fprintf(stderr, "    %%c7");
+                outp += sprintf(outp, "    %%c7");
        if (do_snb_cstates)
-                fprintf(stderr, "   %%pc2");
+                outp += sprintf(outp, "   %%pc2");
        if (do_nhm_cstates)
-                fprintf(stderr, "   %%pc3");
+                outp += sprintf(outp, "   %%pc3");
        if (do_nhm_cstates)
-                fprintf(stderr, "   %%pc6");
+                outp += sprintf(outp, "   %%pc6");
        if (do_snb_cstates)
-                fprintf(stderr, "   %%pc7");
+                outp += sprintf(outp, "   %%pc7");
        if (extra_msr_offset)
-                fprintf(stderr, "        MSR 0x%x ", extra_msr_offset);
+                outp += sprintf(outp, "        MSR 0x%x ", extra_msr_offset);
-        putc('\n', stderr);
+        outp += sprintf(outp, "\n");
 }
-void dump_cnt(struct counters *cnt)
+int dump_counters(struct thread_data *t, struct core_data *c,
+        struct pkg_data *p)
 {
-        if (!cnt)
+        fprintf(stderr, "t %p, c %p, p %p\n", t, c, p);
-                return;
-        if (cnt->pkg) fprintf(stderr, "package: %d ", cnt->pkg);
+        if (t) {
-        if (cnt->core) fprintf(stderr, "core:: %d ", cnt->core);
+                fprintf(stderr, "CPU: %d flags 0x%x\n", t->cpu_id, t->flags);
-        if (cnt->cpu) fprintf(stderr, "CPU: %d ", cnt->cpu);
+                fprintf(stderr, "TSC: %016llX\n", t->tsc);
-        if (cnt->tsc) fprintf(stderr, "TSC: %016llX\n", cnt->tsc);
+                fprintf(stderr, "aperf: %016llX\n", t->aperf);
-        if (cnt->c3) fprintf(stderr, "c3: %016llX\n", cnt->c3);
+                fprintf(stderr, "mperf: %016llX\n", t->mperf);
-        if (cnt->c6) fprintf(stderr, "c6: %016llX\n", cnt->c6);
+                fprintf(stderr, "c1: %016llX\n", t->c1);
-        if (cnt->c7) fprintf(stderr, "c7: %016llX\n", cnt->c7);
+                fprintf(stderr, "msr0x%x: %016llX\n",
-        if (cnt->aperf) fprintf(stderr, "aperf: %016llX\n", cnt->aperf);
+                        extra_msr_offset, t->extra_msr);
-        if (cnt->pc2) fprintf(stderr, "pc2: %016llX\n", cnt->pc2);
+        }
-        if (cnt->pc3) fprintf(stderr, "pc3: %016llX\n", cnt->pc3);
-        if (cnt->pc6) fprintf(stderr, "pc6: %016llX\n", cnt->pc6);
-        if (cnt->pc7) fprintf(stderr, "pc7: %016llX\n", cnt->pc7);
-        if (cnt->extra_msr) fprintf(stderr, "msr0x%x: %016llX\n", extra_msr_offset, cnt->extra_msr);
-}
-void dump_list(struct counters *cnt)
+        if (c) {
-{
+                fprintf(stderr, "core: %d\n", c->core_id);
-        printf("dump_list 0x%p\n", cnt);
+                fprintf(stderr, "c3: %016llX\n", c->c3);
+                fprintf(stderr, "c6: %016llX\n", c->c6);
+                fprintf(stderr, "c7: %016llX\n", c->c7);
+        }
-        for (; cnt; cnt = cnt->next)
+        if (p) {
-                dump_cnt(cnt);
+                fprintf(stderr, "package: %d\n", p->package_id);
+                fprintf(stderr, "pc2: %016llX\n", p->pc2);
+                fprintf(stderr, "pc3: %016llX\n", p->pc3);
+                fprintf(stderr, "pc6: %016llX\n", p->pc6);
+                fprintf(stderr, "pc7: %016llX\n", p->pc7);
+        }
+        return 0;
 }
 /*
@@ -253,321 +285,389 @@ void dump_list(struct counters *cnt)
 * TSC: "TSC" 3 columns %3.2
 * percentage " %pc3" %6.2
 */
-void print_cnt(struct counters *p)
+int format_counters(struct thread_data *t, struct core_data *c,
+        struct pkg_data *p)
 {
        double interval_float;
+         /* if showing only 1st thread in core and this isn't one, bail out */
+        if (show_core_only && !(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
+                return 0;
+         /* if showing only 1st thread in pkg and this isn't one, bail out */
+        if (show_pkg_only && !(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
+                return 0;
        interval_float = tv_delta.tv_sec + tv_delta.tv_usec/1000000.0;
-        /* topology columns, print blanks on 1st (average) line */
+        /* topo columns, print blanks on 1st (average) line */
-        if (p == cnt_average) {
+        if (t == &average.threads) {
                if (show_pkg)
-                        fprintf(stderr, "  ");
+                        outp += sprintf(outp, "  ");
                if (show_pkg && show_core)
-                        fprintf(stderr, " ");
+                        outp += sprintf(outp, " ");
                if (show_core)
-                        fprintf(stderr, "   ");
+                        outp += sprintf(outp, "   ");
                if (show_cpu)
-                        fprintf(stderr, " " "   ");
+                        outp += sprintf(outp, " " "   ");
        } else {
-                if (show_pkg)
+                if (show_pkg) {
-                        fprintf(stderr, "%2d", p->pkg);
+                        if (p)
+                                outp += sprintf(outp, "%2d", p->package_id);
+                        else
+                                outp += sprintf(outp, "  ");
+                }
                if (show_pkg && show_core)
-                        fprintf(stderr, " ");
+                        outp += sprintf(outp, " ");
-                if (show_core)
+                if (show_core) {
-                        fprintf(stderr, "%3d", p->core);
+                        if (c)
+                                outp += sprintf(outp, "%3d", c->core_id);
+                        else
+                                outp += sprintf(outp, "   ");
+                }
                if (show_cpu)
-                        fprintf(stderr, " %3d", p->cpu);
+                        outp += sprintf(outp, " %3d", t->cpu_id);
        }
        /* %c0 */
        if (do_nhm_cstates) {
                if (show_pkg || show_core || show_cpu)
-                        fprintf(stderr, " ");
+                        outp += sprintf(outp, " ");
                if (!skip_c0)
-                        fprintf(stderr, "%6.2f", 100.0 * p->mperf/p->tsc);
+                        outp += sprintf(outp, "%6.2f", 100.0 * t->mperf/t->tsc);
                else
-                        fprintf(stderr, "  ****");
+                        outp += sprintf(outp, "  ****");
        }
        /* GHz */
        if (has_aperf) {
                if (!aperf_mperf_unstable) {
-                        fprintf(stderr, " %3.2f",
+                        outp += sprintf(outp, " %3.2f",
-                                1.0 * p->tsc / units * p->aperf /
+                                1.0 * t->tsc / units * t->aperf /
-                                p->mperf / interval_float);
+                                t->mperf / interval_float);
                } else {
-                        if (p->aperf > p->tsc || p->mperf > p->tsc) {
+                        if (t->aperf > t->tsc || t->mperf > t->tsc) {
-                                fprintf(stderr, " ***");
+                                outp += sprintf(outp, " ***");
                        } else {
-                                fprintf(stderr, "%3.1f*",
+                                outp += sprintf(outp, "%3.1f*",
-                                        1.0 * p->tsc /
+                                        1.0 * t->tsc /
-                                        units * p->aperf /
+                                        units * t->aperf /
-                                        p->mperf / interval_float);
+                                        t->mperf / interval_float);
                        }
                }
        }
        /* TSC */
-        fprintf(stderr, "%5.2f", 1.0 * p->tsc/units/interval_float);
+        outp += sprintf(outp, "%5.2f", 1.0 * t->tsc/units/interval_float);
        if (do_nhm_cstates) {
                if (!skip_c1)
-                        fprintf(stderr, " %6.2f", 100.0 * p->c1/p->tsc);
+                        outp += sprintf(outp, " %6.2f", 100.0 * t->c1/t->tsc);
                else
-                        fprintf(stderr, "  ****");
+                        outp += sprintf(outp, "  ****");
        }
+        /* print per-core data only for 1st thread in core */
+        if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
+                goto done;
        if (do_nhm_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->c3/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * c->c3/t->tsc);
        if (do_nhm_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->c6/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * c->c6/t->tsc);
        if (do_snb_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->c7/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * c->c7/t->tsc);
+        /* print per-package data only for 1st core in package */
+        if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
+                goto done;
        if (do_snb_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->pc2/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * p->pc2/t->tsc);
        if (do_nhm_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->pc3/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * p->pc3/t->tsc);
        if (do_nhm_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->pc6/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * p->pc6/t->tsc);
        if (do_snb_cstates)
-                fprintf(stderr, " %6.2f", 100.0 * p->pc7/p->tsc);
+                outp += sprintf(outp, " %6.2f", 100.0 * p->pc7/t->tsc);
+done:
        if (extra_msr_offset)
-                fprintf(stderr, "  0x%016llx", p->extra_msr);
+                outp += sprintf(outp, "  0x%016llx", t->extra_msr);
-        putc('\n', stderr);
+        outp += sprintf(outp, "\n");
+        return 0;
 }
-void print_counters(struct counters *counters)
+void flush_stdout()
+{
+        fputs(output_buffer, stdout);
+        outp = output_buffer;
+}
+void flush_stderr()
+{
+        fputs(output_buffer, stderr);
+        outp = output_buffer;
+}
+void format_all_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
 {
-        struct counters *cnt;
        static int printed;
        if (!printed || !summary_only)
                print_header();
-        if (num_cpus > 1)
+        if (topo.num_cpus > 1)
-                print_cnt(cnt_average);
+                format_counters(&average.threads, &average.cores,
+                        &average.packages);
        printed = 1;
        if (summary_only)
                return;
-        for (cnt = counters; cnt != NULL; cnt = cnt->next)
+        for_all_cpus(format_counters, t, c, p);
-                print_cnt(cnt);
 }
-#define SUBTRACT_COUNTER(after, before, delta) (delta = (after - before), (before > after))
+void
+delta_package(struct pkg_data *new, struct pkg_data *old)
+{
+        old->pc2 = new->pc2 - old->pc2;
+        old->pc3 = new->pc3 - old->pc3;
+        old->pc6 = new->pc6 - old->pc6;
+        old->pc7 = new->pc7 - old->pc7;
+}
-int compute_delta(struct counters *after,
+void
-        struct counters *before, struct counters *delta)
+delta_core(struct core_data *new, struct core_data *old)
 {
-        int errors = 0;
+        old->c3 = new->c3 - old->c3;
-        int perf_err = 0;
+        old->c6 = new->c6 - old->c6;
+        old->c7 = new->c7 - old->c7;
+}
-        skip_c0 = skip_c1 = 0;
+/*
+ * old = new - old
+ */
+void
+delta_thread(struct thread_data *new, struct thread_data *old,
+        struct core_data *core_delta)
+{
+        old->tsc = new->tsc - old->tsc;
+        /* check for TSC < 1 Mcycles over interval */
+        if (old->tsc < (1000 * 1000)) {
+                fprintf(stderr, "Insanely slow TSC rate, TSC stops in idle?\n");
+                fprintf(stderr, "You can disable all c-states by booting with \"idle=poll\"\n");
+                fprintf(stderr, "or just the deep ones with \"processor.max_cstate=1\"\n");
+                exit(-3);
+        }
-        for ( ; after && before && delta;
+        old->c1 = new->c1 - old->c1;
-                after = after->next, before = before->next, delta = delta->next) {
-                if (before->cpu != after->cpu) {
-                        printf("cpu configuration changed: %d != %d\n",
-                                before->cpu, after->cpu);
-                        return -1;
-                }
-                if (SUBTRACT_COUNTER(after->tsc, before->tsc, delta->tsc)) {
+        if ((new->aperf > old->aperf) && (new->mperf > old->mperf)) {
-                        fprintf(stderr, "cpu%d TSC went backwards %llX to %llX\n",
+                old->aperf = new->aperf - old->aperf;
-                                before->cpu, before->tsc, after->tsc);
+                old->mperf = new->mperf - old->mperf;
-                        errors++;
+        } else {
-                }
-                /* check for TSC < 1 Mcycles over interval */
-                if (delta->tsc < (1000 * 1000)) {
-                        fprintf(stderr, "Insanely slow TSC rate,"
-                                " TSC stops in idle?\n");
-                        fprintf(stderr, "You can disable all c-states"
-                                " by booting with \"idle=poll\"\n");
-                        fprintf(stderr, "or just the deep ones with"
-                                " \"processor.max_cstate=1\"\n");
-                        exit(-3);
-                }
-                if (SUBTRACT_COUNTER(after->c3, before->c3, delta->c3)) {
-                        fprintf(stderr, "cpu%d c3 counter went backwards %llX to %llX\n",
-                                before->cpu, before->c3, after->c3);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->c6, before->c6, delta->c6)) {
-                        fprintf(stderr, "cpu%d c6 counter went backwards %llX to %llX\n",
-                                before->cpu, before->c6, after->c6);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->c7, before->c7, delta->c7)) {
-                        fprintf(stderr, "cpu%d c7 counter went backwards %llX to %llX\n",
-                                before->cpu, before->c7, after->c7);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->pc2, before->pc2, delta->pc2)) {
-                        fprintf(stderr, "cpu%d pc2 counter went backwards %llX to %llX\n",
-                                before->cpu, before->pc2, after->pc2);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->pc3, before->pc3, delta->pc3)) {
-                        fprintf(stderr, "cpu%d pc3 counter went backwards %llX to %llX\n",
-                                before->cpu, before->pc3, after->pc3);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->pc6, before->pc6, delta->pc6)) {
-                        fprintf(stderr, "cpu%d pc6 counter went backwards %llX to %llX\n",
-                                before->cpu, before->pc6, after->pc6);
-                        errors++;
-                }
-                if (SUBTRACT_COUNTER(after->pc7, before->pc7, delta->pc7)) {
-                        fprintf(stderr, "cpu%d pc7 counter went backwards %llX to %llX\n",
-                                before->cpu, before->pc7, after->pc7);
-                        errors++;
-                }
-                perf_err = SUBTRACT_COUNTER(after->aperf, before->aperf, delta->aperf);
+                if (!aperf_mperf_unstable) {
-                if (perf_err) {
+                        fprintf(stderr, "%s: APERF or MPERF went backwards *\n", progname);
-                        fprintf(stderr, "cpu%d aperf counter went backwards %llX to %llX\n",
+                        fprintf(stderr, "* Frequency results do not cover entire interval *\n");
-                                before->cpu, before->aperf, after->aperf);
+                        fprintf(stderr, "* fix this by running Linux-2.6.30 or later *\n");
-                }
-                perf_err |= SUBTRACT_COUNTER(after->mperf, before->mperf, delta->mperf);
-                if (perf_err) {
-                        fprintf(stderr, "cpu%d mperf counter went backwards %llX to %llX\n",
-                                before->cpu, before->mperf, after->mperf);
-                }
-                if (perf_err) {
-                        if (!aperf_mperf_unstable) {
-                                fprintf(stderr, "%s: APERF or MPERF went backwards *\n", progname);
-                                fprintf(stderr, "* Frequency results do not cover entire interval *\n");
-                                fprintf(stderr, "* fix this by running Linux-2.6.30 or later *\n");
-                                aperf_mperf_unstable = 1;
+                        aperf_mperf_unstable = 1;
-                        }
-                        /*
-                         * mperf delta is likely a huge "positive" number
-                         * can not use it for calculating c0 time
-                         */
-                        skip_c0 = 1;
-                        skip_c1 = 1;
                }
                /*
-                 * As mperf and tsc collection are not atomic,
+                 * mperf delta is likely a huge "positive" number
-                 * it is possible for mperf's non-halted cycles
+                 * can not use it for calculating c0 time
-                 * to exceed TSC's all cycles: show c1 = 0% in that case.
                 */
-                if (delta->mperf > delta->tsc)
+                skip_c0 = 1;
-                        delta->c1 = 0;
+                skip_c1 = 1;
-                else /* normal case, derive c1 */
+        }
-                        delta->c1 = delta->tsc - delta->mperf
-                                - delta->c3 - delta->c6 - delta->c7;
-                if (delta->mperf == 0)
-                        delta->mperf = 1;       /* divide by 0 protection */
-                /*
+        /*
-                 * for "extra msr", just copy the latest w/o subtracting
+         * As counter collection is not atomic,
-                 */
+         * it is possible for mperf's non-halted cycles + idle states
-                delta->extra_msr = after->extra_msr;
+         * to exceed TSC's all cycles: show c1 = 0% in that case.
-                if (errors) {
+         */
-                        fprintf(stderr, "ERROR cpu%d before:\n", before->cpu);
+        if ((old->mperf + core_delta->c3 + core_delta->c6 + core_delta->c7) > old->tsc)
-                        dump_cnt(before);
+                old->c1 = 0;
-                        fprintf(stderr, "ERROR cpu%d after:\n", before->cpu);
+        else {
-                        dump_cnt(after);
+                /* normal case, derive c1 */
-                        errors = 0;
+                old->c1 = old->tsc - old->mperf - core_delta->c3
-                }
+                                - core_delta->c6 - core_delta->c7;
        }
+        if (old->mperf == 0) {
+                if (verbose > 1) fprintf(stderr, "cpu%d MPERF 0!\n", old->cpu_id);
+                old->mperf = 1; /* divide by 0 protection */
+        }
+        /*
+         * for "extra msr", just copy the latest w/o subtracting
+         */
+        old->extra_msr = new->extra_msr;
+}
+int delta_cpu(struct thread_data *t, struct core_data *c,
+        struct pkg_data *p, struct thread_data *t2,
+        struct core_data *c2, struct pkg_data *p2)
+{
+        /* calculate core delta only for 1st thread in core */
+        if (t->flags & CPU_IS_FIRST_THREAD_IN_CORE)
+                delta_core(c, c2);
+        /* always calculate thread delta */
+        delta_thread(t, t2, c2);        /* c2 is core delta */
+        /* calculate package delta only for 1st core in package */
+        if (t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE)
+                delta_package(p, p2);
        return 0;
 }
-void compute_average(struct counters *delta, struct counters *avg)
+void clear_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
+{
+        t->tsc = 0;
+        t->aperf = 0;
+        t->mperf = 0;
+        t->c1 = 0;
+        /* tells format_counters to dump all fields from this set */
+        t->flags = CPU_IS_FIRST_THREAD_IN_CORE | CPU_IS_FIRST_CORE_IN_PACKAGE;
+        c->c3 = 0;
+        c->c6 = 0;
+        c->c7 = 0;
+        p->pc2 = 0;
+        p->pc3 = 0;
+        p->pc6 = 0;
+        p->pc7 = 0;
+}
+int sum_counters(struct thread_data *t, struct core_data *c,
+        struct pkg_data *p)
 {
-        struct counters *sum;
+        average.threads.tsc += t->tsc;
+        average.threads.aperf += t->aperf;
+        average.threads.mperf += t->mperf;
+        average.threads.c1 += t->c1;
-        sum = calloc(1, sizeof(struct counters));
+        /* sum per-core values only for 1st thread in core */
-        if (sum == NULL) {
+        if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
-                perror("calloc sum");
+                return 0;
-                exit(1);
-        }
-        for (; delta; delta = delta->next) {
+        average.cores.c3 += c->c3;
-                sum->tsc += delta->tsc;
+        average.cores.c6 += c->c6;
-                sum->c1 += delta->c1;
+        average.cores.c7 += c->c7;
-                sum->c3 += delta->c3;
-                sum->c6 += delta->c6;
+        /* sum per-pkg values only for 1st core in pkg */
-                sum->c7 += delta->c7;
+        if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
-                sum->aperf += delta->aperf;
+                return 0;
-                sum->mperf += delta->mperf;
-                sum->pc2 += delta->pc2;
+        average.packages.pc2 += p->pc2;
-                sum->pc3 += delta->pc3;
+        average.packages.pc3 += p->pc3;
-                sum->pc6 += delta->pc6;
+        average.packages.pc6 += p->pc6;
-                sum->pc7 += delta->pc7;
+        average.packages.pc7 += p->pc7;
-        }
-        avg->tsc = sum->tsc/num_cpus;
+        return 0;
-        avg->c1 = sum->c1/num_cpus;
+}
-        avg->c3 = sum->c3/num_cpus;
+/*
-        avg->c6 = sum->c6/num_cpus;
+ * sum the counters for all cpus in the system
-        avg->c7 = sum->c7/num_cpus;
+ * compute the weighted average
-        avg->aperf = sum->aperf/num_cpus;
+ */
-        avg->mperf = sum->mperf/num_cpus;
+void compute_average(struct thread_data *t, struct core_data *c,
-        avg->pc2 = sum->pc2/num_cpus;
+        struct pkg_data *p)
-        avg->pc3 = sum->pc3/num_cpus;
+{
-        avg->pc6 = sum->pc6/num_cpus;
+        clear_counters(&average.threads, &average.cores, &average.packages);
-        avg->pc7 = sum->pc7/num_cpus;
+        for_all_cpus(sum_counters, t, c, p);
-        free(sum);
+        average.threads.tsc /= topo.num_cpus;
+        average.threads.aperf /= topo.num_cpus;
+        average.threads.mperf /= topo.num_cpus;
+        average.threads.c1 /= topo.num_cpus;
+        average.cores.c3 /= topo.num_cores;
+        average.cores.c6 /= topo.num_cores;
+        average.cores.c7 /= topo.num_cores;
+        average.packages.pc2 /= topo.num_packages;
+        average.packages.pc3 /= topo.num_packages;
+        average.packages.pc6 /= topo.num_packages;
+        average.packages.pc7 /= topo.num_packages;
 }
-int get_counters(struct counters *cnt)
+static unsigned long long rdtsc(void)
 {
-        for ( ; cnt; cnt = cnt->next) {
+        unsigned int low, high;
-                if (cpu_migrate(cnt->cpu))
+        asm volatile("rdtsc" : "=a" (low), "=d" (high));
-                        return -1;
-                if (get_msr(cnt->cpu, MSR_TSC, &cnt->tsc))
+        return low | ((unsigned long long)high) << 32;
-                        return -1;
+}
-                if (has_aperf) {
-                        if (get_msr(cnt->cpu, MSR_APERF, &cnt->aperf))
-                                return -1;
-                        if (get_msr(cnt->cpu, MSR_MPERF, &cnt->mperf))
-                                return -1;
-                }
-                if (do_nhm_cstates) {
+/*
-                        if (get_msr(cnt->cpu, MSR_CORE_C3_RESIDENCY, &cnt->c3))
+ * get_counters(...)
-                                return -1;
+ * migrate to cpu
-                        if (get_msr(cnt->cpu, MSR_CORE_C6_RESIDENCY, &cnt->c6))
+ * acquire and record local counters for that cpu
-                                return -1;
+ */
-                }
+int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
+{
+        int cpu = t->cpu_id;
-                if (do_snb_cstates)
+        if (cpu_migrate(cpu))
-                        if (get_msr(cnt->cpu, MSR_CORE_C7_RESIDENCY, &cnt->c7))
+                return -1;
-                                return -1;
-                if (do_nhm_cstates) {
+        t->tsc = rdtsc();       /* we are running on local CPU of interest */
-                        if (get_msr(cnt->cpu, MSR_PKG_C3_RESIDENCY, &cnt->pc3))
-                                return -1;
+        if (has_aperf) {
-                        if (get_msr(cnt->cpu, MSR_PKG_C6_RESIDENCY, &cnt->pc6))
+                if (get_msr(cpu, MSR_APERF, &t->aperf))
-                                return -1;
+                        return -3;
-                }
+                if (get_msr(cpu, MSR_MPERF, &t->mperf))
-                if (do_snb_cstates) {
+                        return -4;
-                        if (get_msr(cnt->cpu, MSR_PKG_C2_RESIDENCY, &cnt->pc2))
+        }
-                                return -1;
-                        if (get_msr(cnt->cpu, MSR_PKG_C7_RESIDENCY, &cnt->pc7))
+        if (extra_msr_offset)
-                                return -1;
+                if (get_msr(cpu, extra_msr_offset, &t->extra_msr))
-                }
+                        return -5;
-                if (extra_msr_offset)
-                        if (get_msr(cnt->cpu, extra_msr_offset, &cnt->extra_msr))
+        /* collect core counters only for 1st thread in core */
-                                return -1;
+        if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
+                return 0;
+        if (do_nhm_cstates) {
+                if (get_msr(cpu, MSR_CORE_C3_RESIDENCY, &c->c3))
+                        return -6;
+                if (get_msr(cpu, MSR_CORE_C6_RESIDENCY, &c->c6))
+                        return -7;
+        }
+        if (do_snb_cstates)
+                if (get_msr(cpu, MSR_CORE_C7_RESIDENCY, &c->c7))
+                        return -8;
+        /* collect package counters only for 1st core in package */
+        if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
+                return 0;
+        if (do_nhm_cstates) {
+                if (get_msr(cpu, MSR_PKG_C3_RESIDENCY, &p->pc3))
+                        return -9;
+                if (get_msr(cpu, MSR_PKG_C6_RESIDENCY, &p->pc6))
+                        return -10;
+        }
+        if (do_snb_cstates) {
+                if (get_msr(cpu, MSR_PKG_C2_RESIDENCY, &p->pc2))
+                        return -11;
+                if (get_msr(cpu, MSR_PKG_C7_RESIDENCY, &p->pc7))
+                        return -12;
        }
        return 0;
 }
-void print_nehalem_info(void)
+void print_verbose_header(void)
 {
        unsigned long long msr;
        unsigned int ratio;
@@ -615,143 +715,82 @@ void print_nehalem_info(void)
 }
-void free_counter_list(struct counters *list)
+void free_all_buffers(void)
 {
-        struct counters *p;
+        CPU_FREE(cpu_present_set);
+        cpu_present_set = NULL;
+        cpu_present_set = 0;
-        for (p = list; p; ) {
+        CPU_FREE(cpu_affinity_set);
-                struct counters *free_me;
+        cpu_affinity_set = NULL;
+        cpu_affinity_setsize = 0;
-                free_me = p;
+        free(thread_even);
-                p = p->next;
+        free(core_even);
-                free(free_me);
+        free(package_even);
-        }
-}
-void free_all_counters(void)
+        thread_even = NULL;
-{
+        core_even = NULL;
-        free_counter_list(cnt_even);
+        package_even = NULL;
-        cnt_even = NULL;
-        free_counter_list(cnt_odd);
+        free(thread_odd);
-        cnt_odd = NULL;
+        free(core_odd);
+        free(package_odd);
-        free_counter_list(cnt_delta);
+        thread_odd = NULL;
-        cnt_delta = NULL;
+        core_odd = NULL;
+        package_odd = NULL;
-        free_counter_list(cnt_average);
+        free(output_buffer);
-        cnt_average = NULL;
+        output_buffer = NULL;
+        outp = NULL;
 }
-void insert_counters(struct counters **list,
+/*
-        struct counters *new)
+ * cpu_is_first_sibling_in_core(cpu)
+ * return 1 if given CPU is 1st HT sibling in the core
+ */
+int cpu_is_first_sibling_in_core(int cpu)
 {
-        struct counters *prev;
+        char path[64];
+        FILE *filep;
-        /*
+        int first_cpu;
-         * list was empty
-         */
-        if (*list == NULL) {
-                new->next = *list;
-                *list = new;
-                return;
-        }
-        if (!summary_only)
-                show_cpu = 1;   /* there is more than one CPU */
-        /*
-         * insert on front of list.
-         * It is sorted by ascending package#, core#, cpu#
-         */
-        if (((*list)->pkg > new->pkg) ||
-            (((*list)->pkg == new->pkg) && ((*list)->core > new->core)) ||
-            (((*list)->pkg == new->pkg) && ((*list)->core == new->core) && ((*list)->cpu > new->cpu))) {
-                new->next = *list;
-                *list = new;
-                return;
-        }
-        prev = *list;
-        while (prev->next && (prev->next->pkg < new->pkg)) {
-                prev = prev->next;
-                if (!summary_only)
-                        show_pkg = 1;   /* there is more than 1 package */
-        }
-        while (prev->next && (prev->next->pkg == new->pkg)
-                && (prev->next->core < new->core)) {
-                prev = prev->next;
-                if (!summary_only)
-                        show_core = 1;  /* there is more than 1 core */
-        }
-        while (prev->next && (prev->next->pkg == new->pkg)
+        sprintf(path, "/sys/devices/system/cpu/cpu%d/topology/thread_siblings_list", cpu);
-                && (prev->next->core == new->core)
+        filep = fopen(path, "r");
-                && (prev->next->cpu < new->cpu)) {
+        if (filep == NULL) {
-                prev = prev->next;
+                perror(path);
+                exit(1);
        }
+        fscanf(filep, "%d", &first_cpu);
-        /*
+        fclose(filep);
-         * insert after "prev"
+        return (cpu == first_cpu);
-         */
-        new->next = prev->next;
-        prev->next = new;
 }
-void alloc_new_counters(int pkg, int core, int cpu)
+/*
+ * cpu_is_first_core_in_package(cpu)
+ * return 1 if given CPU is 1st core in package
+ */
+int cpu_is_first_core_in_package(int cpu)
 {
-        struct counters *new;
+        char path[64];
+        FILE *filep;
-        if (verbose > 1)
+        int first_cpu;
-                printf("pkg%d core%d, cpu%d\n", pkg, core, cpu);
-        new = (struct counters *)calloc(1, sizeof(struct counters));
-        if (new == NULL) {
-                perror("calloc");
-                exit(1);
-        }
-        new->pkg = pkg;
-        new->core = core;
-        new->cpu = cpu;
-        insert_counters(&cnt_odd, new);
-        new = (struct counters *)calloc(1,
-                sizeof(struct counters));
-        if (new == NULL) {
-                perror("calloc");
-                exit(1);
-        }
-        new->pkg = pkg;
-        new->core = core;
-        new->cpu = cpu;
-        insert_counters(&cnt_even, new);
-        new = (struct counters *)calloc(1, sizeof(struct counters));
-        if (new == NULL) {
-                perror("calloc");
-                exit(1);
-        }
-        new->pkg = pkg;
-        new->core = core;
-        new->cpu = cpu;
-        insert_counters(&cnt_delta, new);
-        new = (struct counters *)calloc(1, sizeof(struct counters));
+        sprintf(path, "/sys/devices/system/cpu/cpu%d/topology/core_siblings_list", cpu);
-        if (new == NULL) {
+        filep = fopen(path, "r");
-                perror("calloc");
+        if (filep == NULL) {
+                perror(path);
                exit(1);
        }
-        new->pkg = pkg;
+        fscanf(filep, "%d", &first_cpu);
-        new->core = core;
+        fclose(filep);
-        new->cpu = cpu;
+        return (cpu == first_cpu);
-        cnt_average = new;
 }
 int get_physical_package_id(int cpu)
 {
-        char path[64];
+        char path[80];
        FILE *filep;
        int pkg;
@@ -768,7 +807,7 @@ int get_physical_package_id(int cpu)
 int get_core_id(int cpu)
 {
-        char path[64];
+        char path[80];
        FILE *filep;
        int core;
@@ -783,14 +822,87 @@ int get_core_id(int cpu)
        return core;
 }
+int get_num_ht_siblings(int cpu)
+{
+        char path[80];
+        FILE *filep;
+        int sib1, sib2;
+        int matches;
+        char character;
+        sprintf(path, "/sys/devices/system/cpu/cpu%d/topology/thread_siblings_list", cpu);
+        filep = fopen(path, "r");
+        if (filep == NULL) {
+                perror(path);
+                exit(1);
+        }
+        /*
+         * file format:
+         * if a pair of number with a character between: 2 siblings (eg. 1-2, or 1,4)
+         * otherwinse 1 sibling (self).
+         */
+        matches = fscanf(filep, "%d%c%d\n", &sib1, &character, &sib2);
+        fclose(filep);
+        if (matches == 3)
+                return 2;
+        else
+                return 1;
+}
 /*
- * run func(pkg, core, cpu) on every cpu in /proc/stat
+ * run func(thread, core, package) in topology order
+ * skip non-present cpus
 */
-int for_all_cpus(void (func)(int, int, int))
+int for_all_cpus_2(int (func)(struct thread_data *, struct core_data *,
+        struct pkg_data *, struct thread_data *, struct core_data *,
+        struct pkg_data *), struct thread_data *thread_base,
+        struct core_data *core_base, struct pkg_data *pkg_base,
+        struct thread_data *thread_base2, struct core_data *core_base2,
+        struct pkg_data *pkg_base2)
+{
+        int retval, pkg_no, core_no, thread_no;
+        for (pkg_no = 0; pkg_no < topo.num_packages; ++pkg_no) {
+                for (core_no = 0; core_no < topo.num_cores_per_pkg; ++core_no) {
+                        for (thread_no = 0; thread_no <
+                                topo.num_threads_per_core; ++thread_no) {
+                                struct thread_data *t, *t2;
+                                struct core_data *c, *c2;
+                                struct pkg_data *p, *p2;
+                                t = GET_THREAD(thread_base, thread_no, core_no, pkg_no);
+                                if (cpu_is_not_present(t->cpu_id))
+                                        continue;
+                                t2 = GET_THREAD(thread_base2, thread_no, core_no, pkg_no);
+                                c = GET_CORE(core_base, core_no, pkg_no);
+                                c2 = GET_CORE(core_base2, core_no, pkg_no);
+                                p = GET_PKG(pkg_base, pkg_no);
+                                p2 = GET_PKG(pkg_base2, pkg_no);
+                                retval = func(t, c, p, t2, c2, p2);
+                                if (retval)
+                                        return retval;
+                        }
+                }
+        }
+        return 0;
+}
+/*
+ * run func(cpu) on every cpu in /proc/stat
+ * return max_cpu number
+ */
+int for_all_proc_cpus(int (func)(int))
 {
        FILE *fp;
-        int cpu_count;
+        int cpu_num;
        int retval;
        fp = fopen(proc_stat, "r");
@@ -805,78 +917,88 @@ int for_all_cpus(void (func)(int, int, int))
                exit(1);
        }
-        for (cpu_count = 0; ; cpu_count++) {
+        while (1) {
-                int cpu;
+                retval = fscanf(fp, "cpu%u %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d\n", &cpu_num);
-                retval = fscanf(fp, "cpu%u %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d\n", &cpu);
                if (retval != 1)
                        break;
-                func(get_physical_package_id(cpu), get_core_id(cpu), cpu);
+                retval = func(cpu_num);
+                if (retval) {
+                        fclose(fp);
+                        return(retval);
+                }
        }
        fclose(fp);
-        return cpu_count;
+        return 0;
 }
 void re_initialize(void)
 {
-        free_all_counters();
+        free_all_buffers();
-        num_cpus = for_all_cpus(alloc_new_counters);
+        setup_all_buffers();
-        cpu_mask_uninit();
+        printf("turbostat: re-initialized with num_cpus %d\n", topo.num_cpus);
-        cpu_mask_init(num_cpus);
-        printf("turbostat: re-initialized with num_cpus %d\n", num_cpus);
 }
-void dummy(int pkg, int core, int cpu) { return; }
 /*
- * check to see if a cpu came on-line
+ * count_cpus()
+ * remember the last one seen, it will be the max
 */
-int verify_num_cpus(void)
+int count_cpus(int cpu)
 {
-        int new_num_cpus;
+        if (topo.max_cpu_num < cpu)
+                topo.max_cpu_num = cpu;
-        new_num_cpus = for_all_cpus(dummy);
-        if (new_num_cpus != num_cpus) {
+        topo.num_cpus += 1;
-                if (verbose)
+        return 0;
-                        printf("num_cpus was %d, is now  %d\n",
+}
-                                num_cpus, new_num_cpus);
+int mark_cpu_present(int cpu)
-                return -1;
+{
-        }
+        CPU_SET_S(cpu, cpu_present_setsize, cpu_present_set);
        return 0;
 }
 void turbostat_loop()
 {
+        int retval;
 restart:
-        get_counters(cnt_even);
+        retval = for_all_cpus(get_counters, EVEN_COUNTERS);
+        if (retval) {
+                re_initialize();
+                goto restart;
+        }
        gettimeofday(&tv_even, (struct timezone *)NULL);
        while (1) {
-                if (verify_num_cpus()) {
+                if (for_all_proc_cpus(cpu_is_not_present)) {
                        re_initialize();
                        goto restart;
                }
                sleep(interval_sec);
-                if (get_counters(cnt_odd)) {
+                retval = for_all_cpus(get_counters, ODD_COUNTERS);
+                if (retval) {
                        re_initialize();
                        goto restart;
                }
                gettimeofday(&tv_odd, (struct timezone *)NULL);
-                compute_delta(cnt_odd, cnt_even, cnt_delta);
                timersub(&tv_odd, &tv_even, &tv_delta);
-                compute_average(cnt_delta, cnt_average);
+                for_all_cpus_2(delta_cpu, ODD_COUNTERS, EVEN_COUNTERS);
-                print_counters(cnt_delta);
+                compute_average(EVEN_COUNTERS);
+                format_all_counters(EVEN_COUNTERS);
+                flush_stdout();
                sleep(interval_sec);
-                if (get_counters(cnt_even)) {
+                retval = for_all_cpus(get_counters, EVEN_COUNTERS);
+                if (retval) {
                        re_initialize();
                        goto restart;
                }
                gettimeofday(&tv_even, (struct timezone *)NULL);
-                compute_delta(cnt_even, cnt_odd, cnt_delta);
                timersub(&tv_even, &tv_odd, &tv_delta);
-                compute_average(cnt_delta, cnt_average);
+                for_all_cpus_2(delta_cpu, EVEN_COUNTERS, ODD_COUNTERS);
-                print_counters(cnt_delta);
+                compute_average(ODD_COUNTERS);
+                format_all_counters(ODD_COUNTERS);
+                flush_stdout();
        }
 }
@@ -1051,6 +1173,208 @@ int open_dev_cpu_msr(int dummy1)
        return 0;
 }
+void topology_probe()
+{
+        int i;
+        int max_core_id = 0;
+        int max_package_id = 0;
+        int max_siblings = 0;
+        struct cpu_topology {
+                int core_id;
+                int physical_package_id;
+        } *cpus;
+        /* Initialize num_cpus, max_cpu_num */
+        topo.num_cpus = 0;
+        topo.max_cpu_num = 0;
+        for_all_proc_cpus(count_cpus);
+        if (!summary_only && topo.num_cpus > 1)
+                show_cpu = 1;
+        if (verbose > 1)
+                fprintf(stderr, "num_cpus %d max_cpu_num %d\n", topo.num_cpus, topo.max_cpu_num);
+        cpus = calloc(1, (topo.max_cpu_num  + 1) * sizeof(struct cpu_topology));
+        if (cpus == NULL) {
+                perror("calloc cpus");
+                exit(1);
+        }
+        /*
+         * Allocate and initialize cpu_present_set
+         */
+        cpu_present_set = CPU_ALLOC((topo.max_cpu_num + 1));
+        if (cpu_present_set == NULL) {
+                perror("CPU_ALLOC");
+                exit(3);
+        }
+        cpu_present_setsize = CPU_ALLOC_SIZE((topo.max_cpu_num + 1));
+        CPU_ZERO_S(cpu_present_setsize, cpu_present_set);
+        for_all_proc_cpus(mark_cpu_present);
+        /*
+         * Allocate and initialize cpu_affinity_set
+         */
+        cpu_affinity_set = CPU_ALLOC((topo.max_cpu_num + 1));
+        if (cpu_affinity_set == NULL) {
+                perror("CPU_ALLOC");
+                exit(3);
+        }
+        cpu_affinity_setsize = CPU_ALLOC_SIZE((topo.max_cpu_num + 1));
+        CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set);
+        /*
+         * For online cpus
+         * find max_core_id, max_package_id
+         */
+        for (i = 0; i <= topo.max_cpu_num; ++i) {
+                int siblings;
+                if (cpu_is_not_present(i)) {
+                        if (verbose > 1)
+                                fprintf(stderr, "cpu%d NOT PRESENT\n", i);
+                        continue;
+                }
+                cpus[i].core_id = get_core_id(i);
+                if (cpus[i].core_id > max_core_id)
+                        max_core_id = cpus[i].core_id;
+                cpus[i].physical_package_id = get_physical_package_id(i);
+                if (cpus[i].physical_package_id > max_package_id)
+                        max_package_id = cpus[i].physical_package_id;
+                siblings = get_num_ht_siblings(i);
+                if (siblings > max_siblings)
+                        max_siblings = siblings;
+                if (verbose > 1)
+                        fprintf(stderr, "cpu %d pkg %d core %d\n",
+                                i, cpus[i].physical_package_id, cpus[i].core_id);
+        }
+        topo.num_cores_per_pkg = max_core_id + 1;
+        if (verbose > 1)
+                fprintf(stderr, "max_core_id %d, sizing for %d cores per package\n",
+                        max_core_id, topo.num_cores_per_pkg);
+        if (!summary_only && topo.num_cores_per_pkg > 1)
+                show_core = 1;
+        topo.num_packages = max_package_id + 1;
+        if (verbose > 1)
+                fprintf(stderr, "max_package_id %d, sizing for %d packages\n",
+                        max_package_id, topo.num_packages);
+        if (!summary_only && topo.num_packages > 1)
+                show_pkg = 1;
+        topo.num_threads_per_core = max_siblings;
+        if (verbose > 1)
+                fprintf(stderr, "max_siblings %d\n", max_siblings);
+        free(cpus);
+}
+void
+allocate_counters(struct thread_data **t, struct core_data **c, struct pkg_data **p)
+{
+        int i;
+        *t = calloc(topo.num_threads_per_core * topo.num_cores_per_pkg *
+                topo.num_packages, sizeof(struct thread_data));
+        if (*t == NULL)
+                goto error;
+        for (i = 0; i < topo.num_threads_per_core *
+                topo.num_cores_per_pkg * topo.num_packages; i++)
+                (*t)[i].cpu_id = -1;
+        *c = calloc(topo.num_cores_per_pkg * topo.num_packages,
+                sizeof(struct core_data));
+        if (*c == NULL)
+                goto error;
+        for (i = 0; i < topo.num_cores_per_pkg * topo.num_packages; i++)
+                (*c)[i].core_id = -1;
+        *p = calloc(topo.num_packages, sizeof(struct pkg_data));
+        if (*p == NULL)
+                goto error;
+        for (i = 0; i < topo.num_packages; i++)
+                (*p)[i].package_id = i;
+        return;
+error:
+        perror("calloc counters");
+        exit(1);
+}
+/*
+ * init_counter()
+ *
+ * set cpu_id, core_num, pkg_num
+ * set FIRST_THREAD_IN_CORE and FIRST_CORE_IN_PACKAGE
+ *
+ * increment topo.num_cores when 1st core in pkg seen
+ */
+void init_counter(struct thread_data *thread_base, struct core_data *core_base,
+        struct pkg_data *pkg_base, int thread_num, int core_num,
+        int pkg_num, int cpu_id)
+{
+        struct thread_data *t;
+        struct core_data *c;
+        struct pkg_data *p;
+        t = GET_THREAD(thread_base, thread_num, core_num, pkg_num);
+        c = GET_CORE(core_base, core_num, pkg_num);
+        p = GET_PKG(pkg_base, pkg_num);
+        t->cpu_id = cpu_id;
+        if (thread_num == 0) {
+                t->flags |= CPU_IS_FIRST_THREAD_IN_CORE;
+                if (cpu_is_first_core_in_package(cpu_id))
+                        t->flags |= CPU_IS_FIRST_CORE_IN_PACKAGE;
+        }
+        c->core_id = core_num;
+        p->package_id = pkg_num;
+}
+int initialize_counters(int cpu_id)
+{
+        int my_thread_id, my_core_id, my_package_id;
+        my_package_id = get_physical_package_id(cpu_id);
+        my_core_id = get_core_id(cpu_id);
+        if (cpu_is_first_sibling_in_core(cpu_id)) {
+                my_thread_id = 0;
+                topo.num_cores++;
+        } else {
+                my_thread_id = 1;
+        }
+        init_counter(EVEN_COUNTERS, my_thread_id, my_core_id, my_package_id, cpu_id);
+        init_counter(ODD_COUNTERS, my_thread_id, my_core_id, my_package_id, cpu_id);
+        return 0;
+}
+void allocate_output_buffer()
+{
+        output_buffer = calloc(1, (1 + topo.num_cpus) * 128);
+        outp = output_buffer;
+        if (outp == NULL) {
+                perror("calloc");
+                exit(-1);
+        }
+}
+void setup_all_buffers(void)
+{
+        topology_probe();
+        allocate_counters(&thread_even, &core_even, &package_even);
+        allocate_counters(&thread_odd, &core_odd, &package_odd);
+        allocate_output_buffer();
+        for_all_proc_cpus(initialize_counters);
+}
 void turbostat_init()
 {
        check_cpuid();
@@ -1058,21 +1382,19 @@ void turbostat_init()
        check_dev_msr();
        check_super_user();
-        num_cpus = for_all_cpus(alloc_new_counters);
+        setup_all_buffers();
-        cpu_mask_init(num_cpus);
        if (verbose)
-                print_nehalem_info();
+                print_verbose_header();
 }
 int fork_it(char **argv)
 {
-        int retval;
        pid_t child_pid;
-        get_counters(cnt_even);
-        /* clear affinity side-effect of get_counters() */
+        for_all_cpus(get_counters, EVEN_COUNTERS);
-        sched_setaffinity(0, cpu_present_setsize, cpu_present_set);
+        /* clear affinity side-effect of get_counters() */
+        sched_setaffinity(0, cpu_present_setsize, cpu_present_set);
        gettimeofday(&tv_even, (struct timezone *)NULL);
        child_pid = fork();
@@ -1095,14 +1417,17 @@ int fork_it(char **argv)
                        exit(1);
                }
        }
-        get_counters(cnt_odd);
+        /*
+         * n.b. fork_it() does not check for errors from for_all_cpus()
+         * because re-starting is problematic when forking
+         */
+        for_all_cpus(get_counters, ODD_COUNTERS);
        gettimeofday(&tv_odd, (struct timezone *)NULL);
-        retval = compute_delta(cnt_odd, cnt_even, cnt_delta);
        timersub(&tv_odd, &tv_even, &tv_delta);
-        compute_average(cnt_delta, cnt_average);
+        for_all_cpus_2(delta_cpu, ODD_COUNTERS, EVEN_COUNTERS);
-        if (!retval)
+        compute_average(EVEN_COUNTERS);
-                print_counters(cnt_delta);
+        format_all_counters(EVEN_COUNTERS);
+        flush_stderr();
        fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);
@@ -1115,8 +1440,14 @@ void cmdline(int argc, char **argv)
        progname = argv[0];
-        while ((opt = getopt(argc, argv, "+svi:M:")) != -1) {
+        while ((opt = getopt(argc, argv, "+cpsvi:M:")) != -1) {
                switch (opt) {
+                case 'c':
+                        show_core_only++;
+                        break;
+                case 'p':
+                        show_pkg_only++;
+                        break;
                case 's':
                        summary_only++;
                        break;
@@ -1142,10 +1473,8 @@ int main(int argc, char **argv)
        cmdline(argc, argv);
        if (verbose > 1)
-                fprintf(stderr, "turbostat Dec 6, 2010"
+                fprintf(stderr, "turbostat v2.0 May 16, 2012"
                        " - Len Brown <lenb@kernel.org>\n");
-        if (verbose > 1)
-                fprintf(stderr, "http://userweb.kernel.org/~lenb/acpi/utils/pmtools/turbostat/\n");
        turbostat_init();