151 files changed, 5587 insertions, 2923 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b4f5e8542829..c52fca833268 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -140,6 +140,7 @@ config ACPI_VIDEO
         tristate "Video"
         depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
         depends on INPUT
+        select THERMAL
         help
           This driver implement the ACPI Extensions For Display Adapters
           for integrated graphics devices on motherboard, as specified in
@@ -151,6 +152,7 @@ config ACPI_VIDEO
 
 config ACPI_FAN
         tristate "Fan"
+        select THERMAL
         default y
         help
           This driver adds support for ACPI fan devices, allowing user-mode 
@@ -172,6 +174,7 @@ config ACPI_BAY
 
 config ACPI_PROCESSOR
         tristate "Processor"
+        select THERMAL
         default y
         help
           This driver installs ACPI as the idle handler for Linux, and uses
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 1fa86811b8ee..d2fc94161848 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -201,6 +201,7 @@ static int is_ejectable_bay(acpi_handle handle)
         return 0;
 }
 
+#if 0
 /**
  * eject_removable_drive - try to eject this drive
  * @dev : the device structure of the drive
@@ -225,6 +226,7 @@ int eject_removable_drive(struct device *dev)
         return 0;
 }
 EXPORT_SYMBOL_GPL(eject_removable_drive);
+#endif  /*  0  */
 
 static int acpi_bay_add_fs(struct bay *bay)
 {
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index f049639bac35..c78078315be9 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,12 +89,16 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
 
         ACPI_FUNCTION_TRACE(ds_create_buffer_field);
 
-        /* Get the name_string argument */
-
+        /*
+         * Get the name_string argument (name of the new buffer_field)
+         */
         if (op->common.aml_opcode == AML_CREATE_FIELD_OP) {
+
+                /* For create_field, name is the 4th argument */
+
                 arg = acpi_ps_get_arg(op, 3);
         } else {
-                /* Create Bit/Byte/Word/Dword field */
+                /* For all other create_xXXField operators, name is the 3rd argument */
 
                 arg = acpi_ps_get_arg(op, 2);
         }
@@ -107,26 +111,30 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                 node = walk_state->deferred_node;
                 status = AE_OK;
         } else {
-                /*
-                 * During the load phase, we want to enter the name of the field into
-                 * the namespace.  During the execute phase (when we evaluate the size
-                 * operand), we want to lookup the name
-                 */
-                if (walk_state->parse_flags & ACPI_PARSE_EXECUTE) {
-                        flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE;
-                } else {
-                        flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
-                            ACPI_NS_ERROR_IF_FOUND;
+                /* Execute flag should always be set when this function is entered */
+
+                if (!(walk_state->parse_flags & ACPI_PARSE_EXECUTE)) {
+                        return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
 
-                /*
-                 * Enter the name_string into the namespace
-                 */
+                /* Creating new namespace node, should not already exist */
+
+                flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
+                    ACPI_NS_ERROR_IF_FOUND;
+
+                /* Mark node temporary if we are executing a method */
+
+                if (walk_state->method_node) {
+                        flags |= ACPI_NS_TEMPORARY;
+                }
+
+                /* Enter the name_string into the namespace */
+
                 status =
                     acpi_ns_lookup(walk_state->scope_info,
                                    arg->common.value.string, ACPI_TYPE_ANY,
                                    ACPI_IMODE_LOAD_PASS1, flags, walk_state,
-                                   &(node));
+                                   &node);
                 if (ACPI_FAILURE(status)) {
                         ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                         return_ACPI_STATUS(status);
@@ -136,13 +144,13 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
         /*
          * We could put the returned object (Node) on the object stack for later,
          * but for now, we will put it in the "op" object that the parser uses,
-         * so we can get it again at the end of this scope
+         * so we can get it again at the end of this scope.
          */
         op->common.node = node;
 
         /*
          * If there is no object attached to the node, this node was just created
-         * and we need to create the field object.  Otherwise, this was a lookup
+         * and we need to create the field object. Otherwise, this was a lookup
          * of an existing node and we don't want to create the field object again.
          */
         obj_desc = acpi_ns_get_attached_object(node);
@@ -164,9 +172,8 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
         }
 
         /*
-         * Remember location in AML stream of the field unit
-         * opcode and operands -- since the buffer and index
-         * operands must be evaluated.
+         * Remember location in AML stream of the field unit opcode and operands --
+         * since the buffer and index operands must be evaluated.
          */
         second_desc = obj_desc->common.next_object;
         second_desc->extra.aml_start = op->named.data;
@@ -261,7 +268,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 
                 case AML_INT_NAMEDFIELD_OP:
 
-                        /* Lookup the name */
+                        /* Lookup the name, it should already exist */
 
                         status = acpi_ns_lookup(walk_state->scope_info,
                                                 (char *)&arg->named.name,
@@ -272,20 +279,23 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                         if (ACPI_FAILURE(status)) {
                                 ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
                                                      status);
-                                if (status != AE_ALREADY_EXISTS) {
-                                        return_ACPI_STATUS(status);
-                                }
-
-                                /* Already exists, ignore error */
+                                return_ACPI_STATUS(status);
                         } else {
                                 arg->common.node = info->field_node;
                                 info->field_bit_length = arg->common.value.size;
 
-                                /* Create and initialize an object for the new Field Node */
-
-                                status = acpi_ex_prep_field_value(info);
-                                if (ACPI_FAILURE(status)) {
-                                        return_ACPI_STATUS(status);
+                                /*
+                                 * If there is no object attached to the node, this node was
+                                 * just created and we need to create the field object.
+                                 * Otherwise, this was a lookup of an existing node and we
+                                 * don't want to create the field object again.
+                                 */
+                                if (!acpi_ns_get_attached_object
+                                    (info->field_node)) {
+                                        status = acpi_ex_prep_field_value(info);
+                                        if (ACPI_FAILURE(status)) {
+                                                return_ACPI_STATUS(status);
+                                        }
                                 }
                         }
 
@@ -399,9 +409,27 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
         union acpi_parse_object *arg = NULL;
         struct acpi_namespace_node *node;
         u8 type = 0;
+        u32 flags;
 
         ACPI_FUNCTION_TRACE_PTR(ds_init_field_objects, op);
 
+        /* Execute flag should always be set when this function is entered */
+
+        if (!(walk_state->parse_flags & ACPI_PARSE_EXECUTE)) {
+                if (walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP) {
+
+                        /* bank_field Op is deferred, just return OK */
+
+                        return_ACPI_STATUS(AE_OK);
+                }
+
+                return_ACPI_STATUS(AE_AML_INTERNAL);
+        }
+
+        /*
+         * Get the field_list argument for this opcode. This is the start of the
+         * list of field elements.
+         */
         switch (walk_state->opcode) {
         case AML_FIELD_OP:
                 arg = acpi_ps_get_arg(op, 2);
@@ -422,20 +450,33 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
+        if (!arg) {
+                return_ACPI_STATUS(AE_AML_NO_OPERAND);
+        }
+
+        /* Creating new namespace node(s), should not already exist */
+
+        flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
+            ACPI_NS_ERROR_IF_FOUND;
+
+        /* Mark node(s) temporary if we are executing a method */
+
+        if (walk_state->method_node) {
+                flags |= ACPI_NS_TEMPORARY;
+        }
+
         /*
          * Walk the list of entries in the field_list
          */
         while (arg) {
-
-                /* Ignore OFFSET and ACCESSAS terms here */
-
+                /*
+                 * Ignore OFFSET and ACCESSAS terms here; we are only interested in the
+                 * field names in order to enter them into the namespace.
+                 */
                 if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
                         status = acpi_ns_lookup(walk_state->scope_info,
-                                                (char *)&arg->named.name,
-                                                type, ACPI_IMODE_LOAD_PASS1,
-                                                ACPI_NS_NO_UPSEARCH |
-                                                ACPI_NS_DONT_OPEN_SCOPE |
-                                                ACPI_NS_ERROR_IF_FOUND,
+                                                (char *)&arg->named.name, type,
+                                                ACPI_IMODE_LOAD_PASS1, flags,
                                                 walk_state, &node);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
@@ -452,7 +493,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
                         arg->common.node = node;
                 }
 
-                /* Move to next field in the list */
+                /* Get the next field element in the list */
 
                 arg = arg->common.next;
         }
@@ -466,7 +507,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
  *
  * PARAMETERS:  Op              - Op containing the Field definition and args
  *              region_node     - Object for the containing Operation Region
- *  `           walk_state      - Current method state
+ *              walk_state      - Current method state
  *
  * RETURN:      Status
  *
@@ -513,36 +554,13 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
                 return_ACPI_STATUS(status);
         }
 
-        /* Third arg is the bank_value */
-
-        /* TBD: This arg is a term_arg, not a constant, and must be evaluated */
-
+        /*
+         * Third arg is the bank_value
+         * This arg is a term_arg, not a constant
+         * It will be evaluated later, by acpi_ds_eval_bank_field_operands
+         */
         arg = arg->common.next;
 
-        /* Currently, only the following constants are supported */
-
-        switch (arg->common.aml_opcode) {
-        case AML_ZERO_OP:
-                info.bank_value = 0;
-                break;
-
-        case AML_ONE_OP:
-                info.bank_value = 1;
-                break;
-
-        case AML_BYTE_OP:
-        case AML_WORD_OP:
-        case AML_DWORD_OP:
-        case AML_QWORD_OP:
-                info.bank_value = (u32) arg->common.value.integer;
-                break;
-
-        default:
-                info.bank_value = 0;
-                ACPI_ERROR((AE_INFO,
-                            "Non-constant BankValue for BankField is not implemented"));
-        }
-
         /* Fourth arg is the field flags */
 
         arg = arg->common.next;
@@ -553,8 +571,17 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
         info.field_type = ACPI_TYPE_LOCAL_BANK_FIELD;
         info.region_node = region_node;
 
-        status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
+        /*
+         * Use Info.data_register_node to store bank_field Op
+         * It's safe because data_register_node will never be used when create bank field
+         * We store aml_start and aml_length in the bank_field Op for late evaluation
+         * Used in acpi_ex_prep_field_value(Info)
+         *
+         * TBD: Or, should we add a field in struct acpi_create_field_info, like "void *ParentOp"?
+         */
+        info.data_register_node = (struct acpi_namespace_node *)op;
 
+        status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index af923c388520..610b1ee102b0 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 1cbe61905824..e48a3ea03117 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
@@ -102,7 +101,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)
                                                     walk_state->opcode,
                                                     walk_state->aml_offset,
                                                     NULL);
-                (void)acpi_ex_enter_interpreter();
+                acpi_ex_enter_interpreter();
         }
 #ifdef ACPI_DISASSEMBLER
         if (ACPI_FAILURE(status)) {
@@ -232,9 +231,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                  * recursive call.
                  */
                 if (!walk_state ||
-                    !obj_desc->method.mutex->mutex.owner_thread ||
-                    (walk_state->thread !=
-                     obj_desc->method.mutex->mutex.owner_thread)) {
+                    !obj_desc->method.mutex->mutex.thread_id ||
+                    (walk_state->thread->thread_id !=
+                     obj_desc->method.mutex->mutex.thread_id)) {
                         /*
                          * Acquire the method mutex. This releases the interpreter if we
                          * block (and reacquires it before it returns)
@@ -254,8 +253,8 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                                     original_sync_level =
                                     walk_state->thread->current_sync_level;
 
-                                obj_desc->method.mutex->mutex.owner_thread =
-                                    walk_state->thread;
+                                obj_desc->method.mutex->mutex.thread_id =
+                                    walk_state->thread->thread_id;
                                 walk_state->thread->current_sync_level =
                                     obj_desc->method.sync_level;
                         } else {
@@ -535,8 +534,6 @@ void
 acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                                  struct acpi_walk_state *walk_state)
 {
-        struct acpi_namespace_node *method_node;
-        acpi_status status;
 
         ACPI_FUNCTION_TRACE_PTR(ds_terminate_control_method, walk_state);
 
@@ -551,34 +548,26 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                 /* Delete all arguments and locals */
 
                 acpi_ds_method_data_delete_all(walk_state);
-        }
 
-        /*
-         * If method is serialized, release the mutex and restore the
-         * current sync level for this thread
-         */
-        if (method_desc->method.mutex) {
+                /*
+                 * If method is serialized, release the mutex and restore the
+                 * current sync level for this thread
+                 */
+                if (method_desc->method.mutex) {
 
-                /* Acquisition Depth handles recursive calls */
+                        /* Acquisition Depth handles recursive calls */
 
-                method_desc->method.mutex->mutex.acquisition_depth--;
-                if (!method_desc->method.mutex->mutex.acquisition_depth) {
-                        walk_state->thread->current_sync_level =
-                            method_desc->method.mutex->mutex.
-                            original_sync_level;
+                        method_desc->method.mutex->mutex.acquisition_depth--;
+                        if (!method_desc->method.mutex->mutex.acquisition_depth) {
+                                walk_state->thread->current_sync_level =
+                                    method_desc->method.mutex->mutex.
+                                    original_sync_level;
 
-                        acpi_os_release_mutex(method_desc->method.mutex->mutex.
-                                              os_mutex);
-                        method_desc->method.mutex->mutex.owner_thread = NULL;
+                                acpi_os_release_mutex(method_desc->method.
+                                                      mutex->mutex.os_mutex);
+                                method_desc->method.mutex->mutex.thread_id = 0;
+                        }
                 }
-        }
-
-        if (walk_state) {
-                /*
-                 * Delete any objects created by this method during execution.
-                 * The method Node is stored in the walk state
-                 */
-                method_node = walk_state->method_node;
 
                 /*
                  * Delete any namespace objects created anywhere within
@@ -620,7 +609,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                  */
                 if ((method_desc->method.method_flags & AML_METHOD_SERIALIZED)
                     && (!method_desc->method.mutex)) {
-                        status = acpi_ds_create_method_mutex(method_desc);
+                        (void)acpi_ds_create_method_mutex(method_desc);
                 }
 
                 /* No more threads, we can free the owner_id */
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index ba4626e06a5e..13c43eac35db 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 954ac8ce958a..1022e38994c2 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -157,7 +157,9 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                          * will remain as named references. This behavior is not described
                          * in the ACPI spec, but it appears to be an oversight.
                          */
-                        obj_desc = (union acpi_operand_object *)op->common.node;
+                        obj_desc =
+                            ACPI_CAST_PTR(union acpi_operand_object,
+                                          op->common.node);
 
                         status =
                             acpi_ex_resolve_node_to_value(ACPI_CAST_INDIRECT_PTR
@@ -172,7 +174,19 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                         switch (op->common.node->type) {
                                 /*
                                  * For these types, we need the actual node, not the subobject.
-                                 * However, the subobject got an extra reference count above.
+                                 * However, the subobject did not get an extra reference count above.
+                                 *
+                                 * TBD: should ex_resolve_node_to_value be changed to fix this?
+                                 */
+                        case ACPI_TYPE_DEVICE:
+                        case ACPI_TYPE_THERMAL:
+
+                                acpi_ut_add_reference(op->common.node->object);
+
+                                /*lint -fallthrough */
+                                /*
+                                 * For these types, we need the actual node, not the subobject.
+                                 * The subobject got an extra reference count in ex_resolve_node_to_value.
                                  */
                         case ACPI_TYPE_MUTEX:
                         case ACPI_TYPE_METHOD:
@@ -180,25 +194,15 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                         case ACPI_TYPE_PROCESSOR:
                         case ACPI_TYPE_EVENT:
                         case ACPI_TYPE_REGION:
-                        case ACPI_TYPE_DEVICE:
-                        case ACPI_TYPE_THERMAL:
 
-                                obj_desc =
-                                    (union acpi_operand_object *)op->common.
-                                    node;
+                                /* We will create a reference object for these types below */
                                 break;
 
                         default:
-                                break;
-                        }
-
-                        /*
-                         * If above resolved to an operand object, we are done. Otherwise,
-                         * we have a NS node, we must create the package entry as a named
-                         * reference.
-                         */
-                        if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) !=
-                            ACPI_DESC_TYPE_NAMED) {
+                                /*
+                                 * All other types - the node was resolved to an actual
+                                 * object, we are done.
+                                 */
                                 goto exit;
                         }
                 }
@@ -223,7 +227,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
 
       exit:
         *obj_desc_ptr = obj_desc;
-        return_ACPI_STATUS(AE_OK);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
@@ -369,7 +373,9 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
         union acpi_parse_object *parent;
         union acpi_operand_object *obj_desc = NULL;
         acpi_status status = AE_OK;
-        acpi_native_uint i;
+        unsigned i;
+        u16 index;
+        u16 reference_count;
 
         ACPI_FUNCTION_TRACE(ds_build_internal_package_obj);
 
@@ -447,13 +453,60 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                                                                package.
                                                                elements[i]);
                 }
+
+                if (*obj_desc_ptr) {
+
+                        /* Existing package, get existing reference count */
+
+                        reference_count =
+                            (*obj_desc_ptr)->common.reference_count;
+                        if (reference_count > 1) {
+
+                                /* Make new element ref count match original ref count */
+
+                                for (index = 0; index < (reference_count - 1);
+                                     index++) {
+                                        acpi_ut_add_reference((obj_desc->
+                                                               package.
+                                                               elements[i]));
+                                }
+                        }
+                }
+
                 arg = arg->common.next;
         }
 
-        if (!arg) {
+        /* Check for match between num_elements and actual length of package_list */
+
+        if (arg) {
+                /*
+                 * num_elements was exhausted, but there are remaining elements in the
+                 * package_list.
+                 *
+                 * Note: technically, this is an error, from ACPI spec: "It is an error
+                 * for NumElements to be less than the number of elements in the
+                 * PackageList". However, for now, we just print an error message and
+                 * no exception is returned.
+                 */
+                while (arg) {
+
+                        /* Find out how many elements there really are */
+
+                        i++;
+                        arg = arg->common.next;
+                }
+
+                ACPI_ERROR((AE_INFO,
+                            "Package List length (%X) larger than NumElements count (%X), truncated\n",
+                            i, element_count));
+        } else if (i < element_count) {
+                /*
+                 * Arg list (elements) was exhausted, but we did not reach num_elements count.
+                 * Note: this is not an error, the package is padded out with NULLs.
+                 */
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Package List length larger than NumElements count (%X), truncated\n",
-                                  element_count));
+                                  "Package List length (%X) smaller than NumElements count (%X), padded with null elements\n",
+                                  i, element_count));
         }
 
         obj_desc->package.flags |= AOPOBJ_DATA_VALID;
@@ -721,6 +774,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                                 /* Node was saved in Op */
 
                                 obj_desc->reference.node = op->common.node;
+                                obj_desc->reference.object =
+                                    op->common.node->object;
                         }
 
                         obj_desc->reference.opcode = opcode;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index f501e083aac7..a818e0ddb996 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
+#include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsopcode")
@@ -219,6 +220,50 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ds_get_bank_field_arguments
+ *
+ * PARAMETERS:  obj_desc        - A valid bank_field object
+ *
+ * RETURN:      Status.
+ *
+ * DESCRIPTION: Get bank_field bank_value. This implements the late
+ *              evaluation of these field attributes.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)
+{
+        union acpi_operand_object *extra_desc;
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_get_bank_field_arguments, obj_desc);
+
+        if (obj_desc->common.flags & AOPOBJ_DATA_VALID) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Get the AML pointer (method object) and bank_field node */
+
+        extra_desc = acpi_ns_get_secondary_object(obj_desc);
+        node = obj_desc->bank_field.node;
+
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
+                        (ACPI_TYPE_LOCAL_BANK_FIELD, node, NULL));
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BankField Arg Init\n",
+                          acpi_ut_get_node_name(node)));
+
+        /* Execute the AML code for the term_arg arguments */
+
+        status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node),
+                                           extra_desc->extra.aml_length,
+                                           extra_desc->extra.aml_start);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ds_get_buffer_arguments
  *
  * PARAMETERS:  obj_desc        - A valid Buffer object
@@ -770,7 +815,109 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
                           obj_desc,
-                          ACPI_FORMAT_UINT64(obj_desc->region.address),
+                          ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),
+                          obj_desc->region.length));
+
+        /* Now the address and length are valid for this opregion */
+
+        obj_desc->region.flags |= AOPOBJ_DATA_VALID;
+
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_eval_table_region_operands
+ *
+ * PARAMETERS:  walk_state      - Current walk
+ *              Op              - A valid region Op object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get region address and length
+ *              Called from acpi_ds_exec_end_op during data_table_region parse tree walk
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
+                                   union acpi_parse_object *op)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        union acpi_operand_object **operand;
+        struct acpi_namespace_node *node;
+        union acpi_parse_object *next_op;
+        acpi_native_uint table_index;
+        struct acpi_table_header *table;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);
+
+        /*
+         * This is where we evaluate the signature_string and oem_iDString
+         * and oem_table_iDString of the data_table_region declaration
+         */
+        node = op->common.node;
+
+        /* next_op points to signature_string op */
+
+        next_op = op->common.value.arg;
+
+        /*
+         * Evaluate/create the signature_string and oem_iDString
+         * and oem_table_iDString operands
+         */
+        status = acpi_ds_create_operands(walk_state, next_op);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Resolve the signature_string and oem_iDString
+         * and oem_table_iDString operands
+         */
+        status = acpi_ex_resolve_operands(op->common.aml_opcode,
+                                          ACPI_WALK_OPERANDS, walk_state);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
+                           acpi_ps_get_opcode_name(op->common.aml_opcode),
+                           1, "after AcpiExResolveOperands");
+
+        operand = &walk_state->operands[0];
+
+        /* Find the ACPI table */
+
+        status = acpi_tb_find_table(operand[0]->string.pointer,
+                                    operand[1]->string.pointer,
+                                    operand[2]->string.pointer, &table_index);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        acpi_ut_remove_reference(operand[0]);
+        acpi_ut_remove_reference(operand[1]);
+        acpi_ut_remove_reference(operand[2]);
+
+        status = acpi_get_table_by_index(table_index, &table);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        obj_desc->region.address =
+            (acpi_physical_address) ACPI_TO_INTEGER(table);
+        obj_desc->region.length = table->length;
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
+                          obj_desc,
+                          ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),
                           obj_desc->region.length));
 
         /* Now the address and length are valid for this opregion */
@@ -808,6 +955,12 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
 
         /* The first operand (for all of these data objects) is the length */
 
+        /*
+         * Set proper index into operand stack for acpi_ds_obj_stack_push
+         * invoked inside acpi_ds_create_operand.
+         */
+        walk_state->operand_index = walk_state->num_operands;
+
         status = acpi_ds_create_operand(walk_state, op->common.value.arg, 1);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -878,6 +1031,106 @@ 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
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get bank_field bank_value
+ *              Called from acpi_ds_exec_end_op during bank_field parse tree walk
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
+                                 union acpi_parse_object *op)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        union acpi_operand_object *operand_desc;
+        struct acpi_namespace_node *node;
+        union acpi_parse_object *next_op;
+        union acpi_parse_object *arg;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_eval_bank_field_operands, op);
+
+        /*
+         * This is where we evaluate the bank_value field of the
+         * bank_field declaration
+         */
+
+        /* next_op points to the op that holds the Region */
+
+        next_op = op->common.value.arg;
+
+        /* next_op points to the op that holds the Bank Register */
+
+        next_op = next_op->common.next;
+
+        /* next_op points to the op that holds the Bank Value */
+
+        next_op = next_op->common.next;
+
+        /*
+         * Set proper index into operand stack for acpi_ds_obj_stack_push
+         * invoked inside acpi_ds_create_operand.
+         *
+         * We use walk_state->Operands[0] to store the evaluated bank_value
+         */
+        walk_state->operand_index = 0;
+
+        status = acpi_ds_create_operand(walk_state, next_op, 0);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_ex_resolve_to_value(&walk_state->operands[0], walk_state);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
+                           acpi_ps_get_opcode_name(op->common.aml_opcode),
+                           1, "after AcpiExResolveOperands");
+
+        /*
+         * Get the bank_value operand and save it
+         * (at Top of stack)
+         */
+        operand_desc = walk_state->operands[0];
+
+        /* Arg points to the start Bank Field */
+
+        arg = acpi_ps_get_arg(op, 4);
+        while (arg) {
+
+                /* Ignore OFFSET and ACCESSAS terms here */
+
+                if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
+                        node = arg->common.node;
+
+                        obj_desc = acpi_ns_get_attached_object(node);
+                        if (!obj_desc) {
+                                return_ACPI_STATUS(AE_NOT_EXIST);
+                        }
+
+                        obj_desc->bank_field.value =
+                            (u32) operand_desc->integer.value;
+                }
+
+                /* Move to next field in the list */
+
+                arg = arg->common.next;
+        }
+
+        acpi_ut_remove_reference(operand_desc);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ds_exec_begin_control_op
  *
  * PARAMETERS:  walk_list       - The list that owns the walk stack
@@ -1070,8 +1323,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
                          * is set to anything other than zero!
                          */
                         walk_state->return_desc = walk_state->operands[0];
-                } else if ((walk_state->results) &&
-                           (walk_state->results->results.num_results > 0)) {
+                } else if (walk_state->result_count) {
 
                         /* Since we have a real Return(), delete any implicit return */
 
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 71503c036f7c..b398982f0d8b 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -278,7 +278,9 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                         AML_VAR_PACKAGE_OP)
                     || (op->common.parent->common.aml_opcode == AML_BUFFER_OP)
                     || (op->common.parent->common.aml_opcode ==
-                        AML_INT_EVAL_SUBTREE_OP)) {
+                        AML_INT_EVAL_SUBTREE_OP)
+                    || (op->common.parent->common.aml_opcode ==
+                        AML_BANK_FIELD_OP)) {
                         /*
                          * These opcodes allow term_arg(s) as operands and therefore
                          * the operands can be method calls.  The result is used.
@@ -472,7 +474,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
         /* A valid name must be looked up in the namespace */
 
         if ((arg->common.aml_opcode == AML_INT_NAMEPATH_OP) &&
-            (arg->common.value.string)) {
+            (arg->common.value.string) &&
+            !(arg->common.flags & ACPI_PARSEOP_IN_STACK)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Getting a name: Arg=%p\n",
                                   arg));
 
@@ -595,7 +598,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
         } else {
                 /* Check for null name case */
 
-                if (arg->common.aml_opcode == AML_INT_NAMEPATH_OP) {
+                if ((arg->common.aml_opcode == AML_INT_NAMEPATH_OP) &&
+                    !(arg->common.flags & ACPI_PARSEOP_IN_STACK)) {
                         /*
                          * If the name is null, this means that this is an
                          * optional result parameter that was not specified
@@ -617,7 +621,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                         return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
                 }
 
-                if (op_info->flags & AML_HAS_RETVAL) {
+                if ((op_info->flags & AML_HAS_RETVAL)
+                    || (arg->common.flags & ACPI_PARSEOP_IN_STACK)) {
                         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                                           "Argument previously created, already stacked\n"));
 
@@ -630,9 +635,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                          * Use value that was already previously returned
                          * by the evaluation of this argument
                          */
-                        status =
-                            acpi_ds_result_pop_from_bottom(&obj_desc,
-                                                           walk_state);
+                        status = acpi_ds_result_pop(&obj_desc, walk_state);
                         if (ACPI_FAILURE(status)) {
                                 /*
                                  * Only error is underflow, and this indicates
@@ -698,27 +701,52 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
 {
         acpi_status status = AE_OK;
         union acpi_parse_object *arg;
+        union acpi_parse_object *arguments[ACPI_OBJ_NUM_OPERANDS];
         u32 arg_count = 0;
+        u32 index = walk_state->num_operands;
+        u32 i;
 
         ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);
 
-        /* For all arguments in the list... */
+        /* Get all arguments in the list */
 
         arg = first_arg;
         while (arg) {
-                status = acpi_ds_create_operand(walk_state, arg, arg_count);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
+                if (index >= ACPI_OBJ_NUM_OPERANDS) {
+                        return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "Arg #%d (%p) done, Arg1=%p\n", arg_count,
-                                  arg, first_arg));
+                arguments[index] = arg;
+                walk_state->operands[index] = NULL;
 
                 /* Move on to next argument, if any */
 
                 arg = arg->common.next;
                 arg_count++;
+                index++;
+        }
+
+        index--;
+
+        /* It is the appropriate order to get objects from the Result stack */
+
+        for (i = 0; i < arg_count; i++) {
+                arg = arguments[index];
+
+                /* Force the filling of the operand stack in inverse order */
+
+                walk_state->operand_index = (u8) index;
+
+                status = acpi_ds_create_operand(walk_state, arg, index);
+                if (ACPI_FAILURE(status)) {
+                        goto cleanup;
+                }
+
+                index--;
+
+                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                  "Arg #%d (%p) done, Arg1=%p\n", index, arg,
+                                  first_arg));
         }
 
         return_ACPI_STATUS(status);
@@ -729,9 +757,112 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
          * pop everything off of the operand stack and delete those
          * objects
          */
-        (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
+        acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
+
+        ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d", index));
+        return_ACPI_STATUS(status);
+}
+
+/*****************************************************************************
+ *
+ * FUNCTION:    acpi_ds_evaluate_name_path
+ *
+ * PARAMETERS:  walk_state      - Current state of the parse tree walk,
+ *                                the opcode of current operation should be
+ *                                AML_INT_NAMEPATH_OP
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Translate the -name_path- parse tree object to the equivalent
+ *              interpreter object, convert it to value, if needed, duplicate
+ *              it, if needed, and push it onto the current result stack.
+ *
+ ****************************************************************************/
+
+acpi_status acpi_ds_evaluate_name_path(struct acpi_walk_state *walk_state)
+{
+        acpi_status status = AE_OK;
+        union acpi_parse_object *op = walk_state->op;
+        union acpi_operand_object **operand = &walk_state->operands[0];
+        union acpi_operand_object *new_obj_desc;
+        u8 type;
+
+        ACPI_FUNCTION_TRACE_PTR(ds_evaluate_name_path, walk_state);
+
+        if (!op->common.parent) {
+
+                /* This happens after certain exception processing */
+
+                goto exit;
+        }
+
+        if ((op->common.parent->common.aml_opcode == AML_PACKAGE_OP) ||
+            (op->common.parent->common.aml_opcode == AML_VAR_PACKAGE_OP) ||
+            (op->common.parent->common.aml_opcode == AML_REF_OF_OP)) {
+
+                /* TBD: Should we specify this feature as a bit of op_info->Flags of these opcodes? */
+
+                goto exit;
+        }
+
+        status = acpi_ds_create_operand(walk_state, op, 0);
+        if (ACPI_FAILURE(status)) {
+                goto exit;
+        }
+
+        if (op->common.flags & ACPI_PARSEOP_TARGET) {
+                new_obj_desc = *operand;
+                goto push_result;
+        }
+
+        type = ACPI_GET_OBJECT_TYPE(*operand);
+
+        status = acpi_ex_resolve_to_value(operand, walk_state);
+        if (ACPI_FAILURE(status)) {
+                goto exit;
+        }
+
+        if (type == ACPI_TYPE_INTEGER) {
+
+                /* It was incremented by acpi_ex_resolve_to_value */
+
+                acpi_ut_remove_reference(*operand);
+
+                status =
+                    acpi_ut_copy_iobject_to_iobject(*operand, &new_obj_desc,
+                                                    walk_state);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+        } else {
+                /*
+                 * The object either was anew created or is
+                 * a Namespace node - don't decrement it.
+                 */
+                new_obj_desc = *operand;
+        }
+
+        /* Cleanup for name-path operand */
+
+        status = acpi_ds_obj_stack_pop(1, walk_state);
+        if (ACPI_FAILURE(status)) {
+                walk_state->result_obj = new_obj_desc;
+                goto exit;
+        }
+
+      push_result:
+
+        walk_state->result_obj = new_obj_desc;
+
+        status = acpi_ds_result_push(walk_state->result_obj, walk_state);
+        if (ACPI_SUCCESS(status)) {
+
+                /* Force to take it from stack */
+
+                op->common.flags |= ACPI_PARSEOP_IN_STACK;
+        }
+
+      exit:
 
-        ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d",
-                        (arg_count + 1)));
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 69693fa07224..b246b9657ead 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -285,11 +285,6 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
         switch (opcode_class) {
         case AML_CLASS_CONTROL:
 
-                status = acpi_ds_result_stack_push(walk_state);
-                if (ACPI_FAILURE(status)) {
-                        goto error_exit;
-                }
-
                 status = acpi_ds_exec_begin_control_op(walk_state, op);
                 break;
 
@@ -305,20 +300,11 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                         status = acpi_ds_load2_begin_op(walk_state, NULL);
                 }
 
-                if (op->common.aml_opcode == AML_REGION_OP) {
-                        status = acpi_ds_result_stack_push(walk_state);
-                }
                 break;
 
         case AML_CLASS_EXECUTE:
         case AML_CLASS_CREATE:
-                /*
-                 * Most operators with arguments (except create_xxx_field operators)
-                 * Start a new result/operand state
-                 */
-                if (walk_state->op_info->object_type != ACPI_TYPE_BUFFER_FIELD) {
-                        status = acpi_ds_result_stack_push(walk_state);
-                }
+
                 break;
 
         default:
@@ -374,6 +360,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         /* Init the walk state */
 
         walk_state->num_operands = 0;
+        walk_state->operand_index = 0;
         walk_state->return_desc = NULL;
         walk_state->result_obj = NULL;
 
@@ -388,10 +375,17 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         /* Decode the Opcode Class */
 
         switch (op_class) {
-        case AML_CLASS_ARGUMENT:        /* constants, literals, etc. - do nothing */
+        case AML_CLASS_ARGUMENT:        /* Constants, literals, etc. */
+
+                if (walk_state->opcode == AML_INT_NAMEPATH_OP) {
+                        status = acpi_ds_evaluate_name_path(walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                goto cleanup;
+                        }
+                }
                 break;
 
-        case AML_CLASS_EXECUTE: /* most operators with arguments */
+        case AML_CLASS_EXECUTE: /* Most operators with arguments */
 
                 /* Build resolved operand stack */
 
@@ -400,13 +394,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                         goto cleanup;
                 }
 
-                /* Done with this result state (Now that operand stack is built) */
-
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_FAILURE(status)) {
-                        goto cleanup;
-                }
-
                 /*
                  * All opcodes require operand resolution, with the only exceptions
                  * being the object_type and size_of operators.
@@ -487,16 +474,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                         status = acpi_ds_exec_end_control_op(walk_state, op);
 
-                        /* Make sure to properly pop the result stack */
-
-                        if (ACPI_SUCCESS(status)) {
-                                status = acpi_ds_result_stack_pop(walk_state);
-                        } else if (status == AE_CTRL_PENDING) {
-                                status = acpi_ds_result_stack_pop(walk_state);
-                                if (ACPI_SUCCESS(status)) {
-                                        status = AE_CTRL_PENDING;
-                                }
-                        }
                         break;
 
                 case AML_TYPE_METHOD_CALL:
@@ -516,7 +493,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                                 op->common.node =
                                     (struct acpi_namespace_node *)op->asl.value.
-                                    arg->asl.node->object;
+                                    arg->asl.node;
                                 acpi_ut_add_reference(op->asl.value.arg->asl.
                                                       node->object);
                                 return_ACPI_STATUS(AE_OK);
@@ -632,13 +609,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                 break;
                         }
 
-                        /* Done with result state (Now that operand stack is built) */
-
-                        status = acpi_ds_result_stack_pop(walk_state);
-                        if (ACPI_FAILURE(status)) {
-                                goto cleanup;
-                        }
-
                         /*
                          * If a result object was returned from above, push it on the
                          * current result stack
@@ -671,8 +641,28 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                 if (ACPI_FAILURE(status)) {
                                         break;
                                 }
+                        } else if (op->common.aml_opcode == AML_DATA_REGION_OP) {
+                                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                                  "Executing DataTableRegion Strings Op=%p\n",
+                                                  op));
+
+                                status =
+                                    acpi_ds_eval_table_region_operands
+                                    (walk_state, op);
+                                if (ACPI_FAILURE(status)) {
+                                        break;
+                                }
+                        } else if (op->common.aml_opcode == AML_BANK_FIELD_OP) {
+                                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                                  "Executing BankField Op=%p\n",
+                                                  op));
 
-                                status = acpi_ds_result_stack_pop(walk_state);
+                                status =
+                                    acpi_ds_eval_bank_field_operands(walk_state,
+                                                                     op);
+                                if (ACPI_FAILURE(status)) {
+                                        break;
+                                }
                         }
                         break;
 
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 8ab9d1b29a4c..dff7a3e445a8 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,6 +443,15 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
                         if (ACPI_FAILURE(status)) {
                                 return_ACPI_STATUS(status);
                         }
+                } else if (op->common.aml_opcode == AML_DATA_REGION_OP) {
+                        status =
+                            acpi_ex_create_region(op->named.data,
+                                                  op->named.length,
+                                                  REGION_DATA_TABLE,
+                                                  walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
                 }
         }
 #endif
@@ -767,6 +776,12 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                     acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
                                    object_type, ACPI_IMODE_LOAD_PASS2, flags,
                                    walk_state, &node);
+
+                if (ACPI_SUCCESS(status) && (flags & ACPI_NS_TEMPORARY)) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                          "***New Node [%4.4s] %p is temporary\n",
+                                          acpi_ut_get_node_name(node), node));
+                }
                 break;
         }
 
@@ -823,6 +838,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
         struct acpi_namespace_node *new_node;
 #ifndef ACPI_NO_METHOD_EXECUTION
         u32 i;
+        u8 region_space;
 #endif
 
         ACPI_FUNCTION_TRACE(ds_load2_end_op);
@@ -1003,11 +1019,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         status = acpi_ex_create_event(walk_state);
                         break;
 
-                case AML_DATA_REGION_OP:
-
-                        status = acpi_ex_create_table_region(walk_state);
-                        break;
-
                 case AML_ALIAS_OP:
 
                         status = acpi_ex_create_alias(walk_state);
@@ -1035,6 +1046,15 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                 switch (op->common.aml_opcode) {
 #ifndef ACPI_NO_METHOD_EXECUTION
                 case AML_REGION_OP:
+                case AML_DATA_REGION_OP:
+
+                        if (op->common.aml_opcode == AML_REGION_OP) {
+                                region_space = (acpi_adr_space_type)
+                                    ((op->common.value.arg)->common.value.
+                                     integer);
+                        } else {
+                                region_space = REGION_DATA_TABLE;
+                        }
 
                         /*
                          * If we are executing a method, initialize the region
@@ -1043,10 +1063,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                                 status =
                                     acpi_ex_create_region(op->named.data,
                                                           op->named.length,
-                                                          (acpi_adr_space_type)
-                                                          ((op->common.value.
-                                                            arg)->common.value.
-                                                           integer),
+                                                          region_space,
                                                           walk_state);
                                 if (ACPI_FAILURE(status)) {
                                         return (status);
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index 3927c495e4bf..9e6073265873 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 5afcdd9c7449..1386ced332ec 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,85 +49,9 @@
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswstate")
 
-/* Local prototypes */
-#ifdef ACPI_OBSOLETE_FUNCTIONS
-acpi_status
-acpi_ds_result_insert(void *object,
-                      u32 index, struct acpi_walk_state *walk_state);
-
-acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state *walk_state);
-
-acpi_status
-acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
-                             struct acpi_walk_state *walk_state);
-
-void *acpi_ds_obj_stack_get_value(u32 index,
-                                  struct acpi_walk_state *walk_state);
-#endif
-
-#ifdef ACPI_FUTURE_USAGE
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_result_remove
- *
- * PARAMETERS:  Object              - Where to return the popped object
- *              Index               - Where to extract the object
- *              walk_state          - Current Walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Pop an object off the bottom of this walk's result stack.  In
- *              other words, this is a FIFO.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_result_remove(union acpi_operand_object **object,
-                      u32 index, struct acpi_walk_state *walk_state)
-{
-        union acpi_generic_state *state;
-
-        ACPI_FUNCTION_NAME(ds_result_remove);
-
-        state = walk_state->results;
-        if (!state) {
-                ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
-                            walk_state));
-                return (AE_NOT_EXIST);
-        }
-
-        if (index >= ACPI_OBJ_MAX_OPERAND) {
-                ACPI_ERROR((AE_INFO,
-                            "Index out of range: %X State=%p Num=%X",
-                            index, walk_state, state->results.num_results));
-        }
-
-        /* Check for a valid result object */
-
-        if (!state->results.obj_desc[index]) {
-                ACPI_ERROR((AE_INFO,
-                            "Null operand! State=%p #Ops=%X, Index=%X",
-                            walk_state, state->results.num_results, index));
-                return (AE_AML_NO_RETURN_VALUE);
-        }
-
-        /* Remove the object */
-
-        state->results.num_results--;
-
-        *object = state->results.obj_desc[index];
-        state->results.obj_desc[index] = NULL;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Obj=%p [%s] Index=%X State=%p Num=%X\n",
-                          *object,
-                          (*object) ? acpi_ut_get_object_type_name(*object) :
-                          "NULL", index, walk_state,
-                          state->results.num_results));
-
-        return (AE_OK);
-}
-#endif                          /*  ACPI_FUTURE_USAGE  */
+  /* Local prototypes */
+static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *ws);
+static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *ws);
 
 /*******************************************************************************
  *
@@ -138,122 +62,67 @@ acpi_ds_result_remove(union acpi_operand_object **object,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Pop an object off the bottom of this walk's result stack.  In
- *              other words, this is a FIFO.
+ * DESCRIPTION: Pop an object off the top of this walk's result stack
  *
  ******************************************************************************/
 
 acpi_status
-acpi_ds_result_pop(union acpi_operand_object ** object,
-                   struct acpi_walk_state * walk_state)
+acpi_ds_result_pop(union acpi_operand_object **object,
+                   struct acpi_walk_state *walk_state)
 {
         acpi_native_uint index;
         union acpi_generic_state *state;
+        acpi_status status;
 
         ACPI_FUNCTION_NAME(ds_result_pop);
 
         state = walk_state->results;
-        if (!state) {
-                return (AE_OK);
-        }
-
-        if (!state->results.num_results) {
-                ACPI_ERROR((AE_INFO, "Result stack is empty! State=%p",
-                            walk_state));
-                return (AE_AML_NO_RETURN_VALUE);
-        }
 
-        /* Remove top element */
+        /* Incorrect state of result stack */
 
-        state->results.num_results--;
-
-        for (index = ACPI_OBJ_NUM_OPERANDS; index; index--) {
-
-                /* Check for a valid result object */
-
-                if (state->results.obj_desc[index - 1]) {
-                        *object = state->results.obj_desc[index - 1];
-                        state->results.obj_desc[index - 1] = NULL;
-
-                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                          "Obj=%p [%s] Index=%X State=%p Num=%X\n",
-                                          *object,
-                                          (*object) ?
-                                          acpi_ut_get_object_type_name(*object)
-                                          : "NULL", (u32) index - 1, walk_state,
-                                          state->results.num_results));
-
-                        return (AE_OK);
-                }
+        if (state && !walk_state->result_count) {
+                ACPI_ERROR((AE_INFO, "No results on result stack"));
+                return (AE_AML_INTERNAL);
         }
 
-        ACPI_ERROR((AE_INFO, "No result objects! State=%p", walk_state));
-        return (AE_AML_NO_RETURN_VALUE);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_result_pop_from_bottom
- *
- * PARAMETERS:  Object              - Where to return the popped object
- *              walk_state          - Current Walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Pop an object off the bottom of this walk's result stack.  In
- *              other words, this is a FIFO.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
-                               struct acpi_walk_state * walk_state)
-{
-        acpi_native_uint index;
-        union acpi_generic_state *state;
+        if (!state && walk_state->result_count) {
+                ACPI_ERROR((AE_INFO, "No result state for result stack"));
+                return (AE_AML_INTERNAL);
+        }
 
-        ACPI_FUNCTION_NAME(ds_result_pop_from_bottom);
+        /* Empty result stack */
 
-        state = walk_state->results;
         if (!state) {
-                ACPI_ERROR((AE_INFO,
-                            "No result object pushed! State=%p", walk_state));
-                return (AE_NOT_EXIST);
-        }
-
-        if (!state->results.num_results) {
-                ACPI_ERROR((AE_INFO, "No result objects! State=%p",
+                ACPI_ERROR((AE_INFO, "Result stack is empty! State=%p",
                             walk_state));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
-        /* Remove Bottom element */
-
-        *object = state->results.obj_desc[0];
-
-        /* Push entire stack down one element */
-
-        for (index = 0; index < state->results.num_results; index++) {
-                state->results.obj_desc[index] =
-                    state->results.obj_desc[index + 1];
-        }
+        /* Return object of the top element and clean that top element result stack */
 
-        state->results.num_results--;
-
-        /* Check for a valid result object */
+        walk_state->result_count--;
+        index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;
 
+        *object = state->results.obj_desc[index];
         if (!*object) {
                 ACPI_ERROR((AE_INFO,
-                            "Null operand! State=%p #Ops=%X Index=%X",
-                            walk_state, state->results.num_results,
-                            (u32) index));
+                            "No result objects on result stack, State=%p",
+                            walk_state));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Obj=%p [%s] Results=%p State=%p\n",
-                          *object,
-                          (*object) ? acpi_ut_get_object_type_name(*object) :
-                          "NULL", state, walk_state));
+        state->results.obj_desc[index] = NULL;
+        if (index == 0) {
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                          "Obj=%p [%s] Index=%X State=%p Num=%X\n", *object,
+                          acpi_ut_get_object_type_name(*object),
+                          (u32) index, walk_state, walk_state->result_count));
 
         return (AE_OK);
 }
@@ -276,39 +145,56 @@ acpi_ds_result_push(union acpi_operand_object * object,
                     struct acpi_walk_state * walk_state)
 {
         union acpi_generic_state *state;
+        acpi_status status;
+        acpi_native_uint index;
 
         ACPI_FUNCTION_NAME(ds_result_push);
 
+        if (walk_state->result_count > walk_state->result_size) {
+                ACPI_ERROR((AE_INFO, "Result stack is full"));
+                return (AE_AML_INTERNAL);
+        } else if (walk_state->result_count == walk_state->result_size) {
+
+                /* Extend the result stack */
+
+                status = acpi_ds_result_stack_push(walk_state);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Failed to extend the result stack"));
+                        return (status);
+                }
+        }
+
+        if (!(walk_state->result_count < walk_state->result_size)) {
+                ACPI_ERROR((AE_INFO, "No free elements in result stack"));
+                return (AE_AML_INTERNAL);
+        }
+
         state = walk_state->results;
         if (!state) {
                 ACPI_ERROR((AE_INFO, "No result stack frame during push"));
                 return (AE_AML_INTERNAL);
         }
 
-        if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_ERROR((AE_INFO,
-                            "Result stack overflow: Obj=%p State=%p Num=%X",
-                            object, walk_state, state->results.num_results));
-                return (AE_STACK_OVERFLOW);
-        }
-
         if (!object) {
                 ACPI_ERROR((AE_INFO,
                             "Null Object! Obj=%p State=%p Num=%X",
-                            object, walk_state, state->results.num_results));
+                            object, walk_state, walk_state->result_count));
                 return (AE_BAD_PARAMETER);
         }
 
-        state->results.obj_desc[state->results.num_results] = object;
-        state->results.num_results++;
+        /* Assign the address of object to the top free element of result stack */
+
+        index = walk_state->result_count % ACPI_RESULTS_FRAME_OBJ_NUM;
+        state->results.obj_desc[index] = object;
+        walk_state->result_count++;
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Obj=%p [%s] State=%p Num=%X Cur=%X\n",
                           object,
-                          object ?
                           acpi_ut_get_object_type_name((union
                                                         acpi_operand_object *)
-                                                       object) : "NULL",
-                          walk_state, state->results.num_results,
+                                                       object), walk_state,
+                          walk_state->result_count,
                           walk_state->current_result));
 
         return (AE_OK);
@@ -322,16 +208,25 @@ acpi_ds_result_push(union acpi_operand_object * object,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Push an object onto the walk_state result stack.
+ * DESCRIPTION: Push an object onto the walk_state result stack
  *
  ******************************************************************************/
 
-acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
+static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *walk_state)
 {
         union acpi_generic_state *state;
 
         ACPI_FUNCTION_NAME(ds_result_stack_push);
 
+        /* Check for stack overflow */
+
+        if (((u32) walk_state->result_size + ACPI_RESULTS_FRAME_OBJ_NUM) >
+            ACPI_RESULTS_OBJ_NUM_MAX) {
+                ACPI_ERROR((AE_INFO, "Result stack overflow: State=%p Num=%X",
+                            walk_state, walk_state->result_size));
+                return (AE_STACK_OVERFLOW);
+        }
+
         state = acpi_ut_create_generic_state();
         if (!state) {
                 return (AE_NO_MEMORY);
@@ -340,6 +235,10 @@ acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
         state->common.descriptor_type = ACPI_DESC_TYPE_STATE_RESULT;
         acpi_ut_push_generic_state(&walk_state->results, state);
 
+        /* Increase the length of the result stack by the length of frame */
+
+        walk_state->result_size += ACPI_RESULTS_FRAME_OBJ_NUM;
+
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Results=%p State=%p\n",
                           state, walk_state));
 
@@ -354,11 +253,11 @@ acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Pop an object off of the walk_state result stack.
+ * DESCRIPTION: Pop an object off of the walk_state result stack
  *
  ******************************************************************************/
 
-acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
+static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state)
 {
         union acpi_generic_state *state;
 
@@ -367,18 +266,27 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
         /* Check for stack underflow */
 
         if (walk_state->results == NULL) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Underflow - State=%p\n",
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "Result stack underflow - State=%p\n",
                                   walk_state));
                 return (AE_AML_NO_OPERAND);
         }
 
+        if (walk_state->result_size < ACPI_RESULTS_FRAME_OBJ_NUM) {
+                ACPI_ERROR((AE_INFO, "Insufficient result stack size"));
+                return (AE_AML_INTERNAL);
+        }
+
         state = acpi_ut_pop_generic_state(&walk_state->results);
+        acpi_ut_delete_generic_state(state);
+
+        /* Decrease the length of result stack by the length of frame */
+
+        walk_state->result_size -= ACPI_RESULTS_FRAME_OBJ_NUM;
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                           "Result=%p RemainingResults=%X State=%p\n",
-                          state, state->results.num_results, walk_state));
-
-        acpi_ut_delete_generic_state(state);
+                          state, walk_state->result_count, walk_state));
 
         return (AE_OK);
 }
@@ -412,9 +320,13 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
 
         /* Put the object onto the stack */
 
-        walk_state->operands[walk_state->num_operands] = object;
+        walk_state->operands[walk_state->operand_index] = object;
         walk_state->num_operands++;
 
+        /* For the usual order of filling the operand stack */
+
+        walk_state->operand_index++;
+
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Obj=%p [%s] State=%p #Ops=%X\n",
                           object,
                           acpi_ut_get_object_type_name((union
@@ -484,43 +396,36 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
  *
  ******************************************************************************/
 
-acpi_status
+void
 acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
-                                 struct acpi_walk_state * walk_state)
+                                 struct acpi_walk_state *walk_state)
 {
-        u32 i;
+        acpi_native_int i;
         union acpi_operand_object *obj_desc;
 
         ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
 
-        for (i = 0; i < pop_count; i++) {
-
-                /* Check for stack underflow */
+        if (pop_count == 0) {
+                return;
+        }
 
+        for (i = (acpi_native_int) (pop_count - 1); i >= 0; i--) {
                 if (walk_state->num_operands == 0) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Object stack underflow! Count=%X State=%p #Ops=%X",
-                                    pop_count, walk_state,
-                                    walk_state->num_operands));
-                        return (AE_STACK_UNDERFLOW);
+                        return;
                 }
 
                 /* Pop the stack and delete an object if present in this stack entry */
 
                 walk_state->num_operands--;
-                obj_desc = walk_state->operands[walk_state->num_operands];
+                obj_desc = walk_state->operands[i];
                 if (obj_desc) {
-                        acpi_ut_remove_reference(walk_state->
-                                                 operands[walk_state->
-                                                          num_operands]);
-                        walk_state->operands[walk_state->num_operands] = NULL;
+                        acpi_ut_remove_reference(walk_state->operands[i]);
+                        walk_state->operands[i] = NULL;
                 }
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Count=%X State=%p #Ops=%X\n",
                           pop_count, walk_state, walk_state->num_operands));
-
-        return (AE_OK);
 }
 
 /*******************************************************************************
@@ -560,7 +465,7 @@ struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
  *
  * RETURN:      None
  *
- * DESCRIPTION: Place the Thread state at the head of the state list.
+ * DESCRIPTION: Place the Thread state at the head of the state list
  *
  ******************************************************************************/
 
@@ -636,7 +541,6 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union
                                                   *thread)
 {
         struct acpi_walk_state *walk_state;
-        acpi_status status;
 
         ACPI_FUNCTION_TRACE(ds_create_walk_state);
 
@@ -659,14 +563,6 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union
         acpi_ds_method_data_init(walk_state);
 #endif
 
-        /* Create an initial result stack entry */
-
-        status = acpi_ds_result_stack_push(walk_state);
-        if (ACPI_FAILURE(status)) {
-                ACPI_FREE(walk_state);
-                return_PTR(NULL);
-        }
-
         /* Put the new state at the head of the walk list */
 
         if (thread) {
@@ -860,190 +756,3 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
         ACPI_FREE(walk_state);
         return_VOID;
 }
-
-#ifdef ACPI_OBSOLETE_FUNCTIONS
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_result_insert
- *
- * PARAMETERS:  Object              - Object to push
- *              Index               - Where to insert the object
- *              walk_state          - Current Walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Insert an object onto this walk's result stack
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_result_insert(void *object,
-                      u32 index, struct acpi_walk_state *walk_state)
-{
-        union acpi_generic_state *state;
-
-        ACPI_FUNCTION_NAME(ds_result_insert);
-
-        state = walk_state->results;
-        if (!state) {
-                ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
-                            walk_state));
-                return (AE_NOT_EXIST);
-        }
-
-        if (index >= ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_ERROR((AE_INFO,
-                            "Index out of range: %X Obj=%p State=%p Num=%X",
-                            index, object, walk_state,
-                            state->results.num_results));
-                return (AE_BAD_PARAMETER);
-        }
-
-        if (!object) {
-                ACPI_ERROR((AE_INFO,
-                            "Null Object! Index=%X Obj=%p State=%p Num=%X",
-                            index, object, walk_state,
-                            state->results.num_results));
-                return (AE_BAD_PARAMETER);
-        }
-
-        state->results.obj_desc[index] = object;
-        state->results.num_results++;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Obj=%p [%s] State=%p Num=%X Cur=%X\n",
-                          object,
-                          object ?
-                          acpi_ut_get_object_type_name((union
-                                                        acpi_operand_object *)
-                                                       object) : "NULL",
-                          walk_state, state->results.num_results,
-                          walk_state->current_result));
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_obj_stack_delete_all
- *
- * PARAMETERS:  walk_state          - Current Walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Clear the object stack by deleting all objects that are on it.
- *              Should be used with great care, if at all!
- *
- ******************************************************************************/
-
-acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state * walk_state)
-{
-        u32 i;
-
-        ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_delete_all, walk_state);
-
-        /* The stack size is configurable, but fixed */
-
-        for (i = 0; i < ACPI_OBJ_NUM_OPERANDS; i++) {
-                if (walk_state->operands[i]) {
-                        acpi_ut_remove_reference(walk_state->operands[i]);
-                        walk_state->operands[i] = NULL;
-                }
-        }
-
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_obj_stack_pop_object
- *
- * PARAMETERS:  Object              - Where to return the popped object
- *              walk_state          - Current Walk state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Pop this walk's object stack.  Objects on the stack are NOT
- *              deleted by this routine.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
-                             struct acpi_walk_state *walk_state)
-{
-        ACPI_FUNCTION_NAME(ds_obj_stack_pop_object);
-
-        /* Check for stack underflow */
-
-        if (walk_state->num_operands == 0) {
-                ACPI_ERROR((AE_INFO,
-                            "Missing operand/stack empty! State=%p #Ops=%X",
-                            walk_state, walk_state->num_operands));
-                *object = NULL;
-                return (AE_AML_NO_OPERAND);
-        }
-
-        /* Pop the stack */
-
-        walk_state->num_operands--;
-
-        /* Check for a valid operand */
-
-        if (!walk_state->operands[walk_state->num_operands]) {
-                ACPI_ERROR((AE_INFO,
-                            "Null operand! State=%p #Ops=%X",
-                            walk_state, walk_state->num_operands));
-                *object = NULL;
-                return (AE_AML_NO_OPERAND);
-        }
-
-        /* Get operand and set stack entry to null */
-
-        *object = walk_state->operands[walk_state->num_operands];
-        walk_state->operands[walk_state->num_operands] = NULL;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Obj=%p [%s] State=%p #Ops=%X\n",
-                          *object, acpi_ut_get_object_type_name(*object),
-                          walk_state, walk_state->num_operands));
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ds_obj_stack_get_value
- *
- * PARAMETERS:  Index               - Stack index whose value is desired.  Based
- *                                    on the top of the stack (index=0 == top)
- *              walk_state          - Current Walk state
- *
- * RETURN:      Pointer to the requested operand
- *
- * DESCRIPTION: Retrieve an object from this walk's operand stack.  Index must
- *              be within the range of the current stack pointer.
- *
- ******************************************************************************/
-
-void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)
-{
-
-        ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_get_value, walk_state);
-
-        /* Can't do it if the stack is empty */
-
-        if (walk_state->num_operands == 0) {
-                return_PTR(NULL);
-        }
-
-        /* or if the index is past the top of the stack */
-
-        if (index > (walk_state->num_operands - (u32) 1)) {
-                return_PTR(NULL);
-        }
-
-        return_PTR(walk_state->
-                   operands[(acpi_native_uint) (walk_state->num_operands - 1) -
-                            index]);
-}
-#endif
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e3f04b272f3f..0924992187e8 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -73,38 +73,14 @@ enum ec_event {
 
 #define ACPI_EC_DELAY           500     /* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK      1000    /* Wait 1ms max. to get global lock */
+#define ACPI_EC_UDELAY          100     /* Wait 100us before polling EC again */
 
 enum {
         EC_FLAGS_WAIT_GPE = 0,          /* Don't check status until GPE arrives */
         EC_FLAGS_QUERY_PENDING,         /* Query is pending */
         EC_FLAGS_GPE_MODE,              /* Expect GPE to be sent for status change */
-        EC_FLAGS_NO_ADDRESS_GPE,        /* Expect GPE only for non-address event */
-        EC_FLAGS_ADDRESS,               /* Address is being written */
-        EC_FLAGS_NO_WDATA_GPE,          /* Don't expect WDATA GPE event */
-        EC_FLAGS_WDATA,                 /* Data is being written */
-        EC_FLAGS_NO_OBF1_GPE,           /* Don't expect GPE before read */
-};
-
-static int acpi_ec_remove(struct acpi_device *device, int type);
-static int acpi_ec_start(struct acpi_device *device);
-static int acpi_ec_stop(struct acpi_device *device, int type);
-static int acpi_ec_add(struct acpi_device *device);
-
-static const struct acpi_device_id ec_device_ids[] = {
-        {"PNP0C09", 0},
-        {"", 0},
-};
-
-static struct acpi_driver acpi_ec_driver = {
-        .name = "ec",
-        .class = ACPI_EC_CLASS,
-        .ids = ec_device_ids,
-        .ops = {
-                .add = acpi_ec_add,
-                .remove = acpi_ec_remove,
-                .start = acpi_ec_start,
-                .stop = acpi_ec_stop,
-                },
+        EC_FLAGS_NO_GPE,                /* Don't use GPE mode */
+        EC_FLAGS_RESCHEDULE_POLL        /* Re-schedule poll */
 };
 
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
@@ -129,6 +105,8 @@ static struct acpi_ec {
         struct mutex lock;
         wait_queue_head_t wait;
         struct list_head list;
+        struct delayed_work work;
+        atomic_t irq_count;
         u8 handlers_installed;
 } *boot_ec, *first_ec;
 
@@ -177,65 +155,52 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
         return 0;
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
+static void ec_schedule_ec_poll(struct acpi_ec *ec)
 {
-        int ret = 0;
+        if (test_bit(EC_FLAGS_RESCHEDULE_POLL, &ec->flags))
+                schedule_delayed_work(&ec->work,
+                                      msecs_to_jiffies(ACPI_EC_DELAY));
+}
 
-        if (unlikely(event == ACPI_EC_EVENT_OBF_1 &&
-                     test_bit(EC_FLAGS_NO_OBF1_GPE, &ec->flags)))
-                force_poll = 1;
-        if (unlikely(test_bit(EC_FLAGS_ADDRESS, &ec->flags) &&
-                     test_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags)))
-                force_poll = 1;
-        if (unlikely(test_bit(EC_FLAGS_WDATA, &ec->flags) &&
-                     test_bit(EC_FLAGS_NO_WDATA_GPE, &ec->flags)))
-                force_poll = 1;
+static void ec_switch_to_poll_mode(struct acpi_ec *ec)
+{
+        set_bit(EC_FLAGS_NO_GPE, &ec->flags);
+        clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
+        acpi_disable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
+        set_bit(EC_FLAGS_RESCHEDULE_POLL, &ec->flags);
+}
+
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
+{
+        atomic_set(&ec->irq_count, 0);
         if (likely(test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) &&
             likely(!force_poll)) {
                 if (wait_event_timeout(ec->wait, acpi_ec_check_status(ec, event),
                                        msecs_to_jiffies(ACPI_EC_DELAY)))
-                        goto end;
+                        return 0;
                 clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 if (acpi_ec_check_status(ec, event)) {
-                        if (event == ACPI_EC_EVENT_OBF_1) {
-                                /* miss OBF_1 GPE, don't expect it */
-                                pr_info(PREFIX "missing OBF confirmation, "
-                                        "don't expect it any longer.\n");
-                                set_bit(EC_FLAGS_NO_OBF1_GPE, &ec->flags);
-                        } else if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {
-                                /* miss address GPE, don't expect it anymore */
-                                pr_info(PREFIX "missing address confirmation, "
-                                        "don't expect it any longer.\n");
-                                set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags);
-                        } else if (test_bit(EC_FLAGS_WDATA, &ec->flags)) {
-                                /* miss write data GPE, don't expect it */
-                                pr_info(PREFIX "missing write data confirmation, "
-                                        "don't expect it any longer.\n");
-                                set_bit(EC_FLAGS_NO_WDATA_GPE, &ec->flags);
-                        } else {
-                                /* missing GPEs, switch back to poll mode */
-                                if (printk_ratelimit())
-                                        pr_info(PREFIX "missing confirmations, "
+                        /* missing GPEs, switch back to poll mode */
+                        if (printk_ratelimit())
+                                pr_info(PREFIX "missing confirmations, "
                                                 "switch off interrupt mode.\n");
-                                clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-                        }
-                        goto end;
+                        ec_switch_to_poll_mode(ec);
+                        ec_schedule_ec_poll(ec);
+                        return 0;
                 }
         } else {
                 unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
                 clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 while (time_before(jiffies, delay)) {
                         if (acpi_ec_check_status(ec, event))
-                                goto end;
+                                return 0;
+                        udelay(ACPI_EC_UDELAY);
                 }
         }
-        pr_err(PREFIX "acpi_ec_wait timeout,"
-                               " status = %d, expect_event = %d\n",
-                               acpi_ec_read_status(ec), event);
-        ret = -ETIME;
-      end:
-        clear_bit(EC_FLAGS_ADDRESS, &ec->flags);
-        return ret;
+        pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
+                acpi_ec_read_status(ec),
+                (event == ACPI_EC_EVENT_OBF_1) ? "\"b0=1\"" : "\"b1=0\"");
+        return -ETIME;
 }
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
@@ -245,8 +210,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
 {
         int result = 0;
         set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
-        acpi_ec_write_cmd(ec, command);
         pr_debug(PREFIX "transaction start\n");
+        acpi_ec_write_cmd(ec, command);
         for (; wdata_len > 0; --wdata_len) {
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll);
                 if (result) {
@@ -254,15 +219,11 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
                                "write_cmd timeout, command = %d\n", command);
                         goto end;
                 }
-                /* mark the address byte written to EC */
-                if (rdata_len + wdata_len > 1)
-                        set_bit(EC_FLAGS_ADDRESS, &ec->flags);
                 set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 acpi_ec_write_data(ec, *(wdata++));
         }
 
         if (!rdata_len) {
-                set_bit(EC_FLAGS_WDATA, &ec->flags);
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll);
                 if (result) {
                         pr_err(PREFIX
@@ -527,47 +488,51 @@ static u32 acpi_ec_gpe_handler(void *data)
 {
         acpi_status status = AE_OK;
         struct acpi_ec *ec = data;
+        u8 state = acpi_ec_read_status(ec);
 
         pr_debug(PREFIX "~~~> interrupt\n");
+        atomic_inc(&ec->irq_count);
+        if (atomic_read(&ec->irq_count) > 5) {
+                pr_err(PREFIX "GPE storm detected, disabling EC GPE\n");
+                ec_switch_to_poll_mode(ec);
+                goto end;
+        }
         clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
         if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))
                 wake_up(&ec->wait);
 
-        if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_SCI) {
+        if (state & ACPI_EC_FLAG_SCI) {
                 if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags))
                         status = acpi_os_execute(OSL_EC_BURST_HANDLER,
                                 acpi_ec_gpe_query, ec);
-        } else if (unlikely(!test_bit(EC_FLAGS_GPE_MODE, &ec->flags))) {
+        } else if (!test_bit(EC_FLAGS_GPE_MODE, &ec->flags) &&
+                   !test_bit(EC_FLAGS_NO_GPE, &ec->flags) &&
+                   in_interrupt()) {
                 /* this is non-query, must be confirmation */
                 if (printk_ratelimit())
                         pr_info(PREFIX "non-query interrupt received,"
                                 " switching to interrupt mode\n");
                 set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
+                clear_bit(EC_FLAGS_RESCHEDULE_POLL, &ec->flags);
         }
-
+end:
+        ec_schedule_ec_poll(ec);
         return ACPI_SUCCESS(status) ?
             ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
 }
 
+static void do_ec_poll(struct work_struct *work)
+{
+        struct acpi_ec *ec = container_of(work, struct acpi_ec, work.work);
+        atomic_set(&ec->irq_count, 0);
+        (void)acpi_ec_gpe_handler(ec);
+}
+
 /* --------------------------------------------------------------------------
                              Address Space Management
    -------------------------------------------------------------------------- */
 
 static acpi_status
-acpi_ec_space_setup(acpi_handle region_handle,
-                    u32 function, void *handler_context, void **return_context)
-{
-        /*
-         * The EC object is in the handler context and is needed
-         * when calling the acpi_ec_space_handler.
-         */
-        *return_context = (function != ACPI_REGION_DEACTIVATE) ?
-            handler_context : NULL;
-
-        return AE_OK;
-}
-
-static acpi_status
 acpi_ec_space_handler(u32 function, acpi_physical_address address,
                       u32 bits, acpi_integer *value,
                       void *handler_context, void *region_context)
@@ -704,6 +669,8 @@ static struct acpi_ec *make_acpi_ec(void)
         mutex_init(&ec->lock);
         init_waitqueue_head(&ec->wait);
         INIT_LIST_HEAD(&ec->list);
+        INIT_DELAYED_WORK_DEFERRABLE(&ec->work, do_ec_poll);
+        atomic_set(&ec->irq_count, 0);
         return ec;
 }
 
@@ -736,17 +703,21 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
         status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
         if (ACPI_FAILURE(status))
                 return status;
-        /* Find and register all query methods */
-        acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
-                            acpi_ec_register_query_methods, ec, NULL);
         /* Use the global lock for all EC transactions? */
         acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
         ec->handle = handle;
         return AE_CTRL_TERMINATE;
 }
 
+static void ec_poll_stop(struct acpi_ec *ec)
+{
+        clear_bit(EC_FLAGS_RESCHEDULE_POLL, &ec->flags);
+        cancel_delayed_work(&ec->work);
+}
+
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
+        ec_poll_stop(ec);
         if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                 ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
                 pr_err(PREFIX "failed to remove space handler\n");
@@ -766,31 +737,28 @@ static int acpi_ec_add(struct acpi_device *device)
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
         /* Check for boot EC */
-        if (boot_ec) {
-                if (boot_ec->handle == device->handle) {
-                        /* Pre-loaded EC from DSDT, just move pointer */
-                        ec = boot_ec;
-                        boot_ec = NULL;
-                        goto end;
-                } else if (boot_ec->handle == ACPI_ROOT_OBJECT) {
-                        /* ECDT-based EC, time to shut it down */
-                        ec_remove_handlers(boot_ec);
-                        kfree(boot_ec);
-                        first_ec = boot_ec = NULL;
+        if (boot_ec &&
+            (boot_ec->handle == device->handle ||
+             boot_ec->handle == ACPI_ROOT_OBJECT)) {
+                ec = boot_ec;
+                boot_ec = NULL;
+        } else {
+                ec = make_acpi_ec();
+                if (!ec)
+                        return -ENOMEM;
+                if (ec_parse_device(device->handle, 0, ec, NULL) !=
+                    AE_CTRL_TERMINATE) {
+                        kfree(ec);
+                        return -EINVAL;
                 }
         }
 
-        ec = make_acpi_ec();
-        if (!ec)
-                return -ENOMEM;
-
-        if (ec_parse_device(device->handle, 0, ec, NULL) !=
-            AE_CTRL_TERMINATE) {
-                kfree(ec);
-                return -EINVAL;
-        }
         ec->handle = device->handle;
-      end:
+
+        /* Find and register all query methods */
+        acpi_walk_namespace(ACPI_TYPE_METHOD, ec->handle, 1,
+                            acpi_ec_register_query_methods, ec, NULL);
+
         if (!first_ec)
                 first_ec = ec;
         acpi_driver_data(device) = ec;
@@ -865,7 +833,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
         status = acpi_install_address_space_handler(ec->handle,
                                                     ACPI_ADR_SPACE_EC,
                                                     &acpi_ec_space_handler,
-                                                    &acpi_ec_space_setup, ec);
+                                                    NULL, ec);
         if (ACPI_FAILURE(status)) {
                 acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
                 return -ENODEV;
@@ -892,6 +860,7 @@ static int acpi_ec_start(struct acpi_device *device)
 
         /* EC is fully operational, allow queries */
         clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
+        ec_schedule_ec_poll(ec);
         return ret;
 }
 
@@ -919,6 +888,11 @@ int __init acpi_boot_ec_enable(void)
         return -EFAULT;
 }
 
+static const struct acpi_device_id ec_device_ids[] = {
+        {"PNP0C09", 0},
+        {"", 0},
+};
+
 int __init acpi_ec_ecdt_probe(void)
 {
         int ret;
@@ -939,6 +913,7 @@ int __init acpi_ec_ecdt_probe(void)
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
                 boot_ec->handle = ACPI_ROOT_OBJECT;
+                acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
         } else {
                 /* This workaround is needed only on some broken machines,
                  * which require early EC, but fail to provide ECDT */
@@ -968,6 +943,39 @@ int __init acpi_ec_ecdt_probe(void)
         return -ENODEV;
 }
 
+static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
+{
+        struct acpi_ec *ec = acpi_driver_data(device);
+        /* Stop using GPE */
+        set_bit(EC_FLAGS_NO_GPE, &ec->flags);
+        clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
+        acpi_disable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
+        return 0;
+}
+
+static int acpi_ec_resume(struct acpi_device *device)
+{
+        struct acpi_ec *ec = acpi_driver_data(device);
+        /* Enable use of GPE back */
+        clear_bit(EC_FLAGS_NO_GPE, &ec->flags);
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
+        return 0;
+}
+
+static struct acpi_driver acpi_ec_driver = {
+        .name = "ec",
+        .class = ACPI_EC_CLASS,
+        .ids = ec_device_ids,
+        .ops = {
+                .add = acpi_ec_add,
+                .remove = acpi_ec_remove,
+                .start = acpi_ec_start,
+                .stop = acpi_ec_stop,
+                .suspend = acpi_ec_suspend,
+                .resume = acpi_ec_resume,
+                },
+};
+
 static int __init acpi_ec_init(void)
 {
         int result = 0;
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 3048801a37b5..5d30e5be1b1c 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 0dadd2adc800..5354be44f876 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -248,10 +248,6 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         ACPI_FUNCTION_TRACE(ev_disable_gpe);
 
-        if (!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK)) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
         /* Make sure HW enable masks are updated */
 
         status =
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 361ebe6c4a6f..e6c4d4c49e79 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 21cb749d0c75..2113e58e2221 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,22 +49,7 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evmisc")
 
-/* Names for Notify() values, used for debug output */
-#ifdef ACPI_DEBUG_OUTPUT
-static const char *acpi_notify_value_names[] = {
-        "Bus Check",
-        "Device Check",
-        "Device Wake",
-        "Eject Request",
-        "Device Check Light",
-        "Frequency Mismatch",
-        "Bus Mode Mismatch",
-        "Power Fault"
-};
-#endif
-
 /* Pointer to FACS needed for the Global Lock */
-
 static struct acpi_table_facs *facs = NULL;
 
 /* Local prototypes */
@@ -94,7 +79,6 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node)
         switch (node->type) {
         case ACPI_TYPE_DEVICE:
         case ACPI_TYPE_PROCESSOR:
-        case ACPI_TYPE_POWER:
         case ACPI_TYPE_THERMAL:
                 /*
                  * These are the ONLY objects that can receive ACPI notifications
@@ -139,17 +123,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
          *   initiate soft-off or sleep operation?
          */
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Dispatching Notify(%X) on node %p\n", notify_value,
-                          node));
-
-        if (notify_value <= 7) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Notify value: %s\n",
-                                  acpi_notify_value_names[notify_value]));
-        } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Notify value: 0x%2.2X **Device Specific**\n",
-                                  notify_value));
-        }
+                          "Dispatching Notify on [%4.4s] Node %p Value 0x%2.2X (%s)\n",
+                          acpi_ut_get_node_name(node), node, notify_value,
+                          acpi_ut_get_notify_name(notify_value)));
 
         /* Get the notify object attached to the NS Node */
 
@@ -159,10 +135,12 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                 /* We have the notify object, Get the right handler */
 
                 switch (node->type) {
+
+                        /* Notify allowed only on these types */
+
                 case ACPI_TYPE_DEVICE:
                 case ACPI_TYPE_THERMAL:
                 case ACPI_TYPE_PROCESSOR:
-                case ACPI_TYPE_POWER:
 
                         if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
                                 handler_obj =
@@ -179,8 +157,13 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                 }
         }
 
-        /* If there is any handler to run, schedule the dispatcher */
-
+        /*
+         * If there is any handler to run, schedule the dispatcher.
+         * Check for:
+         * 1) Global system notify handler
+         * 2) Global device notify handler
+         * 3) Per-device notify handler
+         */
         if ((acpi_gbl_system_notify.handler
              && (notify_value <= ACPI_MAX_SYS_NOTIFY))
             || (acpi_gbl_device_notify.handler
@@ -190,6 +173,13 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                         return (AE_NO_MEMORY);
                 }
 
+                if (!handler_obj) {
+                        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 =
                     ACPI_DESC_TYPE_STATE_NOTIFY;
                 notify_info->notify.node = node;
@@ -202,15 +192,12 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                 if (ACPI_FAILURE(status)) {
                         acpi_ut_delete_generic_state(notify_info);
                 }
-        }
-
-        if (!handler_obj) {
+        } else {
                 /*
-                 * There is no per-device notify handler for this device.
-                 * This may or may not be a problem.
+                 * There is no notify handler (per-device or system) for this device.
                  */
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "No notify handler for Notify(%4.4s, %X) node %p\n",
+                                  "No notify handler for Notify (%4.4s, %X) node %p\n",
                                   acpi_ut_get_node_name(node), notify_value,
                                   node));
         }
@@ -349,9 +336,10 @@ acpi_status acpi_ev_init_global_lock_handler(void)
 
         ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
 
-        status =
-            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
-                                    (struct acpi_table_header **)&facs);
+        status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                         ACPI_CAST_INDIRECT_PTR(struct
+                                                                acpi_table_header,
+                                                                &facs));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -439,7 +427,8 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
          * Only one thread can acquire the GL at a time, the global_lock_mutex
          * enforces this. This interface releases the interpreter if we must wait.
          */
-        status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, 0);
+        status = acpi_ex_system_wait_mutex(
+                        acpi_gbl_global_lock_mutex->mutex.os_mutex, 0);
         if (status == AE_TIME) {
                 if (acpi_ev_global_lock_thread_id == acpi_os_get_thread_id()) {
                         acpi_ev_global_lock_acquired++;
@@ -448,9 +437,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
         }
 
         if (ACPI_FAILURE(status)) {
-                status =
-                    acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,
-                                              timeout);
+                status = acpi_ex_system_wait_mutex(
+                                acpi_gbl_global_lock_mutex->mutex.os_mutex,
+                                timeout);
         }
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -460,6 +449,19 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
         acpi_ev_global_lock_acquired++;
 
         /*
+         * Update the global lock handle and check for wraparound. The handle is
+         * only used for the external global lock interfaces, but it is updated
+         * here to properly handle the case where a single thread may acquire the
+         * lock via both the AML and the acpi_acquire_global_lock interfaces. The
+         * handle is therefore updated on the first acquire from a given thread
+         * regardless of where the acquisition request originated.
+         */
+        acpi_gbl_global_lock_handle++;
+        if (acpi_gbl_global_lock_handle == 0) {
+                acpi_gbl_global_lock_handle = 1;
+        }
+
+        /*
          * Make sure that a global lock actually exists. If not, just treat
          * the lock as a standard mutex.
          */
@@ -555,7 +557,7 @@ acpi_status acpi_ev_release_global_lock(void)
         /* Release the local GL mutex */
         acpi_ev_global_lock_thread_id = NULL;
         acpi_ev_global_lock_acquired = 0;
-        acpi_os_release_mutex(acpi_gbl_global_lock_mutex);
+        acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 58ad09725dd2..1628f5934752 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -394,7 +394,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
                           "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
                           &region_obj->region.handler->address_space, handler,
-                          ACPI_FORMAT_UINT64(address),
+                          ACPI_FORMAT_NATIVE_UINT(address),
                           acpi_ut_get_region_name(region_obj->region.
                                                   space_id)));
 
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index b1aaa0e84588..2e3d2c5e4f4d 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 7e5d15ce2395..2a8b77877610 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 6d866a01f5f4..94a6efe020be 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -758,6 +758,12 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_handler)
  *
  * DESCRIPTION: Acquire the ACPI Global Lock
  *
+ * Note: Allows callers with the same thread ID to acquire the global lock
+ * multiple times. In other words, externally, the behavior of the global lock
+ * is identical to an AML mutex. On the first acquire, a new handle is
+ * returned. On any subsequent calls to acquire by the same thread, the same
+ * handle is returned.
+ *
  ******************************************************************************/
 acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
 {
@@ -770,14 +776,19 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
         /* Must lock interpreter to prevent race conditions */
 
         acpi_ex_enter_interpreter();
-        status = acpi_ev_acquire_global_lock(timeout);
-        acpi_ex_exit_interpreter();
+
+        status = acpi_ex_acquire_mutex_object(timeout,
+                                              acpi_gbl_global_lock_mutex,
+                                              acpi_os_get_thread_id());
 
         if (ACPI_SUCCESS(status)) {
-                acpi_gbl_global_lock_handle++;
+
+                /* Return the global lock handle (updated in acpi_ev_acquire_global_lock) */
+
                 *handle = acpi_gbl_global_lock_handle;
         }
 
+        acpi_ex_exit_interpreter();
         return (status);
 }
 
@@ -798,11 +809,11 @@ acpi_status acpi_release_global_lock(u32 handle)
 {
         acpi_status status;
 
-        if (handle != acpi_gbl_global_lock_handle) {
+        if (!handle || (handle != acpi_gbl_global_lock_handle)) {
                 return (AE_NOT_ACQUIRED);
         }
 
-        status = acpi_ev_release_global_lock();
+        status = acpi_ex_release_mutex_object(acpi_gbl_global_lock_mutex);
         return (status);
 }
 
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 9cbd3414a574..99a7502e6a87 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 7bf09c5fb242..e8750807e57d 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 25802f302ffe..24da921d13e3 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,6 @@
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
 #include <acpi/actables.h>
 #include <acpi/acdispat.h>
 
@@ -138,6 +137,14 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 
         ACPI_FUNCTION_TRACE(ex_load_table_op);
 
+        /* Validate lengths for the signature_string, OEMIDString, OEMtable_iD */
+
+        if ((operand[0]->string.length > ACPI_NAME_SIZE) ||
+            (operand[1]->string.length > ACPI_OEM_ID_SIZE) ||
+            (operand[2]->string.length > ACPI_OEM_TABLE_ID_SIZE)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
         /* Find the ACPI table in the RSDT/XSDT */
 
         status = acpi_tb_find_table(operand[0]->string.pointer,
@@ -229,11 +236,18 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
         status = acpi_get_table_by_index(table_index, &table);
         if (ACPI_SUCCESS(status)) {
                 ACPI_INFO((AE_INFO,
-                           "Dynamic OEM Table Load - [%4.4s] OemId [%6.6s] OemTableId [%8.8s]",
+                           "Dynamic OEM Table Load - [%.4s] OemId [%.6s] OemTableId [%.8s]",
                            table->signature, table->oem_id,
                            table->oem_table_id));
         }
 
+        /* 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);
+        }
+
         *return_desc = ddb_handle;
         return_ACPI_STATUS(status);
 }
@@ -268,6 +282,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
         struct acpi_table_desc table_desc;
         acpi_native_uint table_index;
         acpi_status status;
+        u32 length;
 
         ACPI_FUNCTION_TRACE(ex_load_op);
 
@@ -278,16 +293,16 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
         switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
         case ACPI_TYPE_REGION:
 
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Load from Region %p %s\n",
+                                  obj_desc,
+                                  acpi_ut_get_object_type_name(obj_desc)));
+
                 /* Region must be system_memory (from ACPI spec) */
 
                 if (obj_desc->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Load from Region %p %s\n",
-                                  obj_desc,
-                                  acpi_ut_get_object_type_name(obj_desc)));
-
                 /*
                  * If the Region Address and Length have not been previously evaluated,
                  * evaluate them now and save the results.
@@ -299,6 +314,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                         }
                 }
 
+                /*
+                 * We will simply map the memory region for the table. However, the
+                 * memory region is technically not guaranteed to remain stable and
+                 * we may eventually have to copy the table to a local buffer.
+                 */
                 table_desc.address = obj_desc->region.address;
                 table_desc.length = obj_desc->region.length;
                 table_desc.flags = ACPI_TABLE_ORIGIN_MAPPED;
@@ -306,18 +326,41 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
         case ACPI_TYPE_BUFFER:  /* Buffer or resolved region_field */
 
-                /* Simply extract the buffer from the buffer object */
-
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                   "Load from Buffer or Field %p %s\n", obj_desc,
                                   acpi_ut_get_object_type_name(obj_desc)));
 
-                table_desc.pointer = ACPI_CAST_PTR(struct acpi_table_header,
-                                                   obj_desc->buffer.pointer);
-                table_desc.length = table_desc.pointer->length;
-                table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED;
+                length = obj_desc->buffer.length;
+
+                /* Must have at least an ACPI table header */
+
+                if (length < sizeof(struct acpi_table_header)) {
+                        return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
+                }
+
+                /* Validate checksum here. It won't get validated in tb_add_table */
 
-                obj_desc->buffer.pointer = NULL;
+                status =
+                    acpi_tb_verify_checksum(ACPI_CAST_PTR
+                                            (struct acpi_table_header,
+                                             obj_desc->buffer.pointer), length);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+
+                /*
+                 * We need to copy the buffer since the original buffer could be
+                 * changed or deleted in the future
+                 */
+                table_desc.pointer = ACPI_ALLOCATE(length);
+                if (!table_desc.pointer) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
+
+                ACPI_MEMCPY(table_desc.pointer, obj_desc->buffer.pointer,
+                            length);
+                table_desc.length = length;
+                table_desc.flags = ACPI_TABLE_ORIGIN_ALLOCATED;
                 break;
 
         default:
@@ -333,7 +376,8 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
         }
 
         status =
-            acpi_ex_add_table(table_index, acpi_gbl_root_node, &ddb_handle);
+            acpi_ex_add_table(table_index, walk_state->scope_info->scope.node,
+                              &ddb_handle);
         if (ACPI_FAILURE(status)) {
 
                 /* On error, table_ptr was deallocated above */
@@ -349,11 +393,23 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
                 /* table_ptr was deallocated above */
 
+                acpi_ut_remove_reference(ddb_handle);
                 return_ACPI_STATUS(status);
         }
 
+        /* Invoke table handler if present */
+
+        if (acpi_gbl_table_handler) {
+                (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD,
+                                             table_desc.pointer,
+                                             acpi_gbl_table_handler_context);
+        }
+
       cleanup:
         if (ACPI_FAILURE(status)) {
+
+                /* Delete allocated buffer or mapping */
+
                 acpi_tb_delete_table(&table_desc);
         }
         return_ACPI_STATUS(status);
@@ -376,6 +432,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
         acpi_status status = AE_OK;
         union acpi_operand_object *table_desc = ddb_handle;
         acpi_native_uint table_index;
+        struct acpi_table_header *table;
 
         ACPI_FUNCTION_TRACE(ex_unload_table);
 
@@ -395,17 +452,25 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
 
         table_index = (acpi_native_uint) table_desc->reference.object;
 
+        /* Invoke table handler if present */
+
+        if (acpi_gbl_table_handler) {
+                status = acpi_get_table_by_index(table_index, &table);
+                if (ACPI_SUCCESS(status)) {
+                        (void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,
+                                                     table,
+                                                     acpi_gbl_table_handler_context);
+                }
+        }
+
         /*
          * Delete the entire namespace under this table Node
          * (Offset contains the table_id)
          */
         acpi_tb_delete_namespace_by_owner(table_index);
-        acpi_tb_release_owner_id(table_index);
+        (void)acpi_tb_release_owner_id(table_index);
 
         acpi_tb_set_table_loaded_flag(table_index, FALSE);
 
-        /* Delete the table descriptor (ddb_handle) */
-
-        acpi_ut_remove_reference(table_desc);
-        return_ACPI_STATUS(status);
+        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index 79f2c0d42c06..fd954b4ed83d 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 6e9a23e47fef..60e62c4f0577 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -96,6 +96,9 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
          * to the original Node.
          */
         switch (target_node->type) {
+
+                /* For these types, the sub-object can change dynamically via a Store */
+
         case ACPI_TYPE_INTEGER:
         case ACPI_TYPE_STRING:
         case ACPI_TYPE_BUFFER:
@@ -103,9 +106,18 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         case ACPI_TYPE_BUFFER_FIELD:
 
                 /*
+                 * These types open a new scope, so we need the NS node in order to access
+                 * any children.
+                 */
+        case ACPI_TYPE_DEVICE:
+        case ACPI_TYPE_POWER:
+        case ACPI_TYPE_PROCESSOR:
+        case ACPI_TYPE_THERMAL:
+        case ACPI_TYPE_LOCAL_SCOPE:
+
+                /*
                  * The new alias has the type ALIAS and points to the original
-                 * NS node, not the object itself.  This is because for these
-                 * types, the object can change dynamically via a Store.
+                 * NS node, not the object itself.
                  */
                 alias_node->type = ACPI_TYPE_LOCAL_ALIAS;
                 alias_node->object =
@@ -115,9 +127,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         case ACPI_TYPE_METHOD:
 
                 /*
-                 * The new alias has the type ALIAS and points to the original
-                 * NS node, not the object itself.  This is because for these
-                 * types, the object can change dynamically via a Store.
+                 * Control method aliases need to be differentiated
                  */
                 alias_node->type = ACPI_TYPE_LOCAL_METHOD_ALIAS;
                 alias_node->object =
@@ -342,101 +352,6 @@ acpi_ex_create_region(u8 * aml_start,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_create_table_region
- *
- * PARAMETERS:  walk_state          - Current state
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a new data_table_region object
- *
- ******************************************************************************/
-
-acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)
-{
-        acpi_status status;
-        union acpi_operand_object **operand = &walk_state->operands[0];
-        union acpi_operand_object *obj_desc;
-        struct acpi_namespace_node *node;
-        union acpi_operand_object *region_obj2;
-        acpi_native_uint table_index;
-        struct acpi_table_header *table;
-
-        ACPI_FUNCTION_TRACE(ex_create_table_region);
-
-        /* Get the Node from the object stack  */
-
-        node = walk_state->op->common.node;
-
-        /*
-         * If the region object is already attached to this node,
-         * just return
-         */
-        if (acpi_ns_get_attached_object(node)) {
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Find the ACPI table */
-
-        status = acpi_tb_find_table(operand[1]->string.pointer,
-                                    operand[2]->string.pointer,
-                                    operand[3]->string.pointer, &table_index);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Create the region descriptor */
-
-        obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_REGION);
-        if (!obj_desc) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        region_obj2 = obj_desc->common.next_object;
-        region_obj2->extra.region_context = NULL;
-
-        status = acpi_get_table_by_index(table_index, &table);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        /* Init the region from the operands */
-
-        obj_desc->region.space_id = REGION_DATA_TABLE;
-        obj_desc->region.address =
-            (acpi_physical_address) ACPI_TO_INTEGER(table);
-        obj_desc->region.length = table->length;
-        obj_desc->region.node = node;
-        obj_desc->region.flags = AOPOBJ_DATA_VALID;
-
-        /* Install the new region object in the parent Node */
-
-        status = acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_REGION);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-
-        status = acpi_ev_initialize_region(obj_desc, FALSE);
-        if (ACPI_FAILURE(status)) {
-                if (status == AE_NOT_EXIST) {
-                        status = AE_OK;
-                } else {
-                        goto cleanup;
-                }
-        }
-
-        obj_desc->region.flags |= AOPOBJ_SETUP_COMPLETE;
-
-      cleanup:
-
-        /* Remove local reference to the object */
-
-        acpi_ut_remove_reference(obj_desc);
-        return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ex_create_processor
  *
  * PARAMETERS:  walk_state          - Current state
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 51c9c29987c3..74f1b22601b3 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -500,25 +500,28 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                         acpi_os_printf("Reference: Debug\n");
                         break;
 
-                case AML_NAME_OP:
+                case AML_INDEX_OP:
 
-                        ACPI_DUMP_PATHNAME(obj_desc->reference.object,
-                                           "Reference: Name: ", ACPI_LV_INFO,
-                                           _COMPONENT);
-                        ACPI_DUMP_ENTRY(obj_desc->reference.object,
-                                        ACPI_LV_INFO);
+                        acpi_os_printf("Reference: Index %p\n",
+                                       obj_desc->reference.object);
                         break;
 
-                case AML_INDEX_OP:
+                case AML_LOAD_OP:
 
-                        acpi_os_printf("Reference: Index %p\n",
+                        acpi_os_printf("Reference: [DdbHandle] TableIndex %p\n",
                                        obj_desc->reference.object);
                         break;
 
                 case AML_REF_OF_OP:
 
-                        acpi_os_printf("Reference: (RefOf) %p\n",
-                                       obj_desc->reference.object);
+                        acpi_os_printf("Reference: (RefOf) %p [%s]\n",
+                                       obj_desc->reference.object,
+                                       acpi_ut_get_type_name(((union
+                                                               acpi_operand_object
+                                                               *)obj_desc->
+                                                              reference.
+                                                              object)->common.
+                                                             type));
                         break;
 
                 case AML_ARG_OP:
@@ -559,8 +562,9 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
                 case AML_INT_NAMEPATH_OP:
 
-                        acpi_os_printf("Reference.Node->Name %X\n",
-                                       obj_desc->reference.node->name.integer);
+                        acpi_os_printf("Reference: Namepath %X [%4.4s]\n",
+                                       obj_desc->reference.node->name.integer,
+                                       obj_desc->reference.node->name.ascii);
                         break;
 
                 default:
@@ -640,8 +644,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                         acpi_os_printf("\n");
                 } else {
                         acpi_os_printf(" base %8.8X%8.8X Length %X\n",
-                                       ACPI_FORMAT_UINT64(obj_desc->region.
-                                                          address),
+                                       ACPI_FORMAT_NATIVE_UINT(obj_desc->region.
+                                                               address),
                                        obj_desc->region.length);
                 }
                 break;
@@ -877,20 +881,43 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
         ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER;
 
         if (obj_desc->reference.opcode == AML_INT_NAMEPATH_OP) {
-                acpi_os_printf("Named Object %p ", obj_desc->reference.node);
+                acpi_os_printf(" Named Object %p ", obj_desc->reference.node);
 
                 status =
                     acpi_ns_handle_to_pathname(obj_desc->reference.node,
                                                &ret_buf);
                 if (ACPI_FAILURE(status)) {
-                        acpi_os_printf("Could not convert name to pathname\n");
+                        acpi_os_printf(" Could not convert name to pathname\n");
                 } else {
                         acpi_os_printf("%s\n", (char *)ret_buf.pointer);
                         ACPI_FREE(ret_buf.pointer);
                 }
         } else if (obj_desc->reference.object) {
-                acpi_os_printf("\nReferenced Object: %p\n",
-                               obj_desc->reference.object);
+                if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
+                    ACPI_DESC_TYPE_OPERAND) {
+                        acpi_os_printf(" Target: %p",
+                                       obj_desc->reference.object);
+                        if (obj_desc->reference.opcode == AML_LOAD_OP) {
+                                /*
+                                 * For DDBHandle reference,
+                                 * obj_desc->Reference.Object is the table index
+                                 */
+                                acpi_os_printf(" [DDBHandle]\n");
+                        } else {
+                                acpi_os_printf(" [%s]\n",
+                                               acpi_ut_get_type_name(((union
+                                                                       acpi_operand_object
+                                                                       *)
+                                                                      obj_desc->
+                                                                      reference.
+                                                                      object)->
+                                                                     common.
+                                                                     type));
+                        }
+                } else {
+                        acpi_os_printf(" Target: %p\n",
+                                       obj_desc->reference.object);
+                }
         }
 }
 
@@ -976,7 +1003,9 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
 
         case ACPI_TYPE_LOCAL_REFERENCE:
 
-                acpi_os_printf("[Object Reference] ");
+                acpi_os_printf("[Object Reference] %s",
+                               (acpi_ps_get_opcode_info
+                                (obj_desc->reference.opcode))->name);
                 acpi_ex_dump_reference_obj(obj_desc);
                 break;
 
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index 2d88a3d8d1ad..3e440d84226a 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,6 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
         union acpi_operand_object *buffer_desc;
         acpi_size length;
         void *buffer;
-        u8 locked;
 
         ACPI_FUNCTION_TRACE_PTR(ex_read_data_from_field, obj_desc);
 
@@ -111,9 +110,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
 
                 /* Lock entire transaction if requested */
 
-                locked =
-                    acpi_ex_acquire_global_lock(obj_desc->common_field.
-                                                field_flags);
+                acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
                 /*
                  * Perform the read.
@@ -125,7 +122,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
                                                              buffer.pointer),
                                                ACPI_READ | (obj_desc->field.
                                                             attribute << 16));
-                acpi_ex_release_global_lock(locked);
+                acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
                 goto exit;
         }
 
@@ -175,13 +172,12 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
 
         /* Lock entire transaction if requested */
 
-        locked =
-            acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
+        acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
         /* Read from the field */
 
         status = acpi_ex_extract_from_field(obj_desc, buffer, (u32) length);
-        acpi_ex_release_global_lock(locked);
+        acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
 
       exit:
         if (ACPI_FAILURE(status)) {
@@ -214,10 +210,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 {
         acpi_status status;
         u32 length;
-        u32 required_length;
         void *buffer;
-        void *new_buffer;
-        u8 locked;
         union acpi_operand_object *buffer_desc;
 
         ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);
@@ -278,9 +271,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 
                 /* Lock entire transaction if requested */
 
-                locked =
-                    acpi_ex_acquire_global_lock(obj_desc->common_field.
-                                                field_flags);
+                acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
                 /*
                  * Perform the write (returns status and perhaps data in the
@@ -291,7 +282,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                                                (acpi_integer *) buffer,
                                                ACPI_WRITE | (obj_desc->field.
                                                              attribute << 16));
-                acpi_ex_release_global_lock(locked);
+                acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
 
                 *result_desc = buffer_desc;
                 return_ACPI_STATUS(status);
@@ -319,35 +310,6 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
-        /*
-         * We must have a buffer that is at least as long as the field
-         * we are writing to.  This is because individual fields are
-         * indivisible and partial writes are not supported -- as per
-         * the ACPI specification.
-         */
-        new_buffer = NULL;
-        required_length =
-            ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
-
-        if (length < required_length) {
-
-                /* We need to create a new buffer */
-
-                new_buffer = ACPI_ALLOCATE_ZEROED(required_length);
-                if (!new_buffer) {
-                        return_ACPI_STATUS(AE_NO_MEMORY);
-                }
-
-                /*
-                 * Copy the original data to the new buffer, starting
-                 * at Byte zero.  All unused (upper) bytes of the
-                 * buffer will be 0.
-                 */
-                ACPI_MEMCPY((char *)new_buffer, (char *)buffer, length);
-                buffer = new_buffer;
-                length = required_length;
-        }
-
         ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
                           "FieldWrite [FROM]: Obj %p (%s:%X), Buf %p, ByteLen %X\n",
                           source_desc,
@@ -366,19 +328,12 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
 
         /* Lock entire transaction if requested */
 
-        locked =
-            acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
+        acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
         /* Write to the field */
 
         status = acpi_ex_insert_into_field(obj_desc, buffer, length);
-        acpi_ex_release_global_lock(locked);
-
-        /* Free temporary buffer if we used one */
-
-        if (new_buffer) {
-                ACPI_FREE(new_buffer);
-        }
+        acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
 
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index 65a48b6170ee..e336b5dc7a50 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -263,7 +263,8 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
                               rgn_desc->region.space_id,
                               obj_desc->common_field.access_byte_width,
                               obj_desc->common_field.base_byte_offset,
-                              field_datum_byte_offset, (void *)address));
+                              field_datum_byte_offset, ACPI_CAST_PTR(void,
+                                                                     address)));
 
         /* Invoke the appropriate address_space/op_region handler */
 
@@ -805,18 +806,39 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
         u32 datum_count;
         u32 field_datum_count;
         u32 i;
+        u32 required_length;
+        void *new_buffer;
 
         ACPI_FUNCTION_TRACE(ex_insert_into_field);
 
         /* Validate input buffer */
 
-        if (buffer_length <
-            ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
-                ACPI_ERROR((AE_INFO,
-                            "Field size %X (bits) is too large for buffer (%X)",
-                            obj_desc->common_field.bit_length, buffer_length));
+        new_buffer = NULL;
+        required_length =
+            ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
+        /*
+         * We must have a buffer that is at least as long as the field
+         * we are writing to.  This is because individual fields are
+         * indivisible and partial writes are not supported -- as per
+         * the ACPI specification.
+         */
+        if (buffer_length < required_length) {
 
-                return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
+                /* We need to create a new buffer */
+
+                new_buffer = ACPI_ALLOCATE_ZEROED(required_length);
+                if (!new_buffer) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
+
+                /*
+                 * Copy the original data to the new buffer, starting
+                 * at Byte zero.  All unused (upper) bytes of the
+                 * buffer will be 0.
+                 */
+                ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length);
+                buffer = new_buffer;
+                buffer_length = required_length;
         }
 
         /*
@@ -866,7 +888,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                                                         merged_datum,
                                                         field_offset);
                 if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        goto exit;
                 }
 
                 field_offset += obj_desc->common_field.access_byte_width;
@@ -924,5 +946,11 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                                                 mask, merged_datum,
                                                 field_offset);
 
+      exit:
+        /* Free temporary buffer if we used one */
+
+        if (new_buffer) {
+                ACPI_FREE(new_buffer);
+        }
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index f13d1cec2d6d..cc956a5b5267 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 6748e3ef0997..c873ab40cd0e 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -126,6 +126,79 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ex_acquire_mutex_object
+ *
+ * PARAMETERS:  time_desc           - Timeout in milliseconds
+ *              obj_desc            - Mutex object
+ *              Thread              - Current thread state
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Acquire an AML mutex, low-level interface. Provides a common
+ *              path that supports multiple acquires by the same thread.
+ *
+ * MUTEX:       Interpreter must be locked
+ *
+ * NOTE: This interface is called from three places:
+ * 1) From acpi_ex_acquire_mutex, via an AML Acquire() operator
+ * 2) From acpi_ex_acquire_global_lock when an AML Field access requires the
+ *    global lock
+ * 3) From the external interface, acpi_acquire_global_lock
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ex_acquire_mutex_object(u16 timeout,
+                             union acpi_operand_object *obj_desc,
+                             acpi_thread_id thread_id)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ex_acquire_mutex_object, obj_desc);
+
+        if (!obj_desc) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        /* Support for multiple acquires by the owning thread */
+
+        if (obj_desc->mutex.thread_id == thread_id) {
+                /*
+                 * The mutex is already owned by this thread, just increment the
+                 * acquisition depth
+                 */
+                obj_desc->mutex.acquisition_depth++;
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Acquire the mutex, wait if necessary. Special case for Global Lock */
+
+        if (obj_desc == acpi_gbl_global_lock_mutex) {
+                status = acpi_ev_acquire_global_lock(timeout);
+        } else {
+                status = acpi_ex_system_wait_mutex(obj_desc->mutex.os_mutex,
+                                                   timeout);
+        }
+
+        if (ACPI_FAILURE(status)) {
+
+                /* Includes failure from a timeout on time_desc */
+
+                return_ACPI_STATUS(status);
+        }
+
+        /* Acquired the mutex: update mutex object */
+
+        obj_desc->mutex.thread_id = thread_id;
+        obj_desc->mutex.acquisition_depth = 1;
+        obj_desc->mutex.original_sync_level = 0;
+        obj_desc->mutex.owner_thread = NULL;    /* Used only for AML Acquire() */
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ex_acquire_mutex
  *
  * PARAMETERS:  time_desc           - Timeout integer
@@ -151,7 +224,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        /* Sanity check: we must have a valid thread ID */
+        /* Must have a valid thread ID */
 
         if (!walk_state->thread) {
                 ACPI_ERROR((AE_INFO,
@@ -161,7 +234,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
         }
 
         /*
-         * Current Sync must be less than or equal to the sync level of the
+         * Current sync level must be less than or equal to the sync level of the
          * mutex. This mechanism provides some deadlock prevention
          */
         if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
@@ -172,51 +245,89 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
                 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
         }
 
-        /* Support for multiple acquires by the owning thread */
+        status = acpi_ex_acquire_mutex_object((u16) time_desc->integer.value,
+                                              obj_desc,
+                                              walk_state->thread->thread_id);
+        if (ACPI_SUCCESS(status) && obj_desc->mutex.acquisition_depth == 1) {
 
-        if (obj_desc->mutex.owner_thread) {
-                if (obj_desc->mutex.owner_thread->thread_id ==
-                    walk_state->thread->thread_id) {
-                        /*
-                         * The mutex is already owned by this thread, just increment the
-                         * acquisition depth
-                         */
-                        obj_desc->mutex.acquisition_depth++;
-                        return_ACPI_STATUS(AE_OK);
-                }
+                /* Save Thread object, original/current sync levels */
+
+                obj_desc->mutex.owner_thread = walk_state->thread;
+                obj_desc->mutex.original_sync_level =
+                    walk_state->thread->current_sync_level;
+                walk_state->thread->current_sync_level =
+                    obj_desc->mutex.sync_level;
+
+                /* Link the mutex to the current thread for force-unlock at method exit */
+
+                acpi_ex_link_mutex(obj_desc, walk_state->thread);
         }
 
-        /* Acquire the mutex, wait if necessary. Special case for Global Lock */
+        return_ACPI_STATUS(status);
+}
 
-        if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
-                status =
-                    acpi_ev_acquire_global_lock((u16) time_desc->integer.value);
-        } else {
-                status = acpi_ex_system_wait_mutex(obj_desc->mutex.os_mutex,
-                                                   (u16) time_desc->integer.
-                                                   value);
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_release_mutex_object
+ *
+ * PARAMETERS:  obj_desc            - The object descriptor for this op
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Release a previously acquired Mutex, low level interface.
+ *              Provides a common path that supports multiple releases (after
+ *              previous multiple acquires) by the same thread.
+ *
+ * MUTEX:       Interpreter must be locked
+ *
+ * NOTE: This interface is called from three places:
+ * 1) From acpi_ex_release_mutex, via an AML Acquire() operator
+ * 2) From acpi_ex_release_global_lock when an AML Field access requires the
+ *    global lock
+ * 3) From the external interface, acpi_release_global_lock
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc)
+{
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE(ex_release_mutex_object);
+
+        if (obj_desc->mutex.acquisition_depth == 0) {
+                return (AE_NOT_ACQUIRED);
         }
 
-        if (ACPI_FAILURE(status)) {
+        /* Match multiple Acquires with multiple Releases */
 
-                /* Includes failure from a timeout on time_desc */
+        obj_desc->mutex.acquisition_depth--;
+        if (obj_desc->mutex.acquisition_depth != 0) {
 
-                return_ACPI_STATUS(status);
+                /* Just decrement the depth and return */
+
+                return_ACPI_STATUS(AE_OK);
         }
 
-        /* Have the mutex: update mutex and walk info and save the sync_level */
+        if (obj_desc->mutex.owner_thread) {
 
-        obj_desc->mutex.owner_thread = walk_state->thread;
-        obj_desc->mutex.acquisition_depth = 1;
-        obj_desc->mutex.original_sync_level =
-            walk_state->thread->current_sync_level;
+                /* Unlink the mutex from the owner's list */
 
-        walk_state->thread->current_sync_level = obj_desc->mutex.sync_level;
+                acpi_ex_unlink_mutex(obj_desc);
+                obj_desc->mutex.owner_thread = NULL;
+        }
 
-        /* Link the mutex to the current thread for force-unlock at method exit */
+        /* Release the mutex, special case for Global Lock */
 
-        acpi_ex_link_mutex(obj_desc, walk_state->thread);
-        return_ACPI_STATUS(AE_OK);
+        if (obj_desc == acpi_gbl_global_lock_mutex) {
+                status = acpi_ev_release_global_lock();
+        } else {
+                acpi_os_release_mutex(obj_desc->mutex.os_mutex);
+        }
+
+        /* Clear mutex info */
+
+        obj_desc->mutex.thread_id = 0;
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
@@ -253,22 +364,13 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_AML_MUTEX_NOT_ACQUIRED);
         }
 
-        /* Sanity check: we must have a valid thread ID */
-
-        if (!walk_state->thread) {
-                ACPI_ERROR((AE_INFO,
-                            "Cannot release Mutex [%4.4s], null thread info",
-                            acpi_ut_get_node_name(obj_desc->mutex.node)));
-                return_ACPI_STATUS(AE_AML_INTERNAL);
-        }
-
         /*
          * The Mutex is owned, but this thread must be the owner.
          * Special case for Global Lock, any thread can release
          */
         if ((obj_desc->mutex.owner_thread->thread_id !=
              walk_state->thread->thread_id)
-            && (obj_desc->mutex.os_mutex != acpi_gbl_global_lock_mutex)) {
+            && (obj_desc != acpi_gbl_global_lock_mutex)) {
                 ACPI_ERROR((AE_INFO,
                             "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
                             (unsigned long)walk_state->thread->thread_id,
@@ -278,45 +380,37 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
                 return_ACPI_STATUS(AE_AML_NOT_OWNER);
         }
 
+        /* Must have a valid thread ID */
+
+        if (!walk_state->thread) {
+                ACPI_ERROR((AE_INFO,
+                            "Cannot release Mutex [%4.4s], null thread info",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
+                return_ACPI_STATUS(AE_AML_INTERNAL);
+        }
+
         /*
          * The sync level of the mutex must be less than or equal to the current
          * sync level
          */
         if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
                 ACPI_ERROR((AE_INFO,
-                            "Cannot release Mutex [%4.4s], incorrect SyncLevel",
-                            acpi_ut_get_node_name(obj_desc->mutex.node)));
+                            "Cannot release Mutex [%4.4s], SyncLevel mismatch: mutex %d current %d",
+                            acpi_ut_get_node_name(obj_desc->mutex.node),
+                            obj_desc->mutex.sync_level,
+                            walk_state->thread->current_sync_level));
                 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
         }
 
-        /* Match multiple Acquires with multiple Releases */
-
-        obj_desc->mutex.acquisition_depth--;
-        if (obj_desc->mutex.acquisition_depth != 0) {
-
-                /* Just decrement the depth and return */
-
-                return_ACPI_STATUS(AE_OK);
-        }
-
-        /* Unlink the mutex from the owner's list */
+        status = acpi_ex_release_mutex_object(obj_desc);
 
-        acpi_ex_unlink_mutex(obj_desc);
+        if (obj_desc->mutex.acquisition_depth == 0) {
 
-        /* Release the mutex, special case for Global Lock */
+                /* Restore the original sync_level */
 
-        if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
-                status = acpi_ev_release_global_lock();
-        } else {
-                acpi_os_release_mutex(obj_desc->mutex.os_mutex);
+                walk_state->thread->current_sync_level =
+                    obj_desc->mutex.original_sync_level;
         }
-
-        /* Update the mutex and restore sync_level */
-
-        obj_desc->mutex.owner_thread = NULL;
-        walk_state->thread->current_sync_level =
-            obj_desc->mutex.original_sync_level;
-
         return_ACPI_STATUS(status);
 }
 
@@ -357,7 +451,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
 
                 /* Release the mutex, special case for Global Lock */
 
-                if (obj_desc->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
+                if (obj_desc == acpi_gbl_global_lock_mutex) {
 
                         /* Ignore errors */
 
@@ -369,6 +463,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
                 /* Mark mutex unowned */
 
                 obj_desc->mutex.owner_thread = NULL;
+                obj_desc->mutex.thread_id = 0;
 
                 /* Update Thread sync_level (Last mutex is the important one) */
 
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 308eae52dc05..817e67be3697 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 252f10acbbcc..7c3bea575e02 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -121,6 +121,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
 
         if ((ACPI_FAILURE(status)) || walk_state->result_obj) {
                 acpi_ut_remove_reference(return_desc);
+                walk_state->result_obj = NULL;
         } else {
                 /* Save the return value */
 
@@ -739,26 +740,38 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                         value = acpi_gbl_integer_byte_width;
                         break;
 
-                case ACPI_TYPE_BUFFER:
-                        value = temp_desc->buffer.length;
-                        break;
-
                 case ACPI_TYPE_STRING:
                         value = temp_desc->string.length;
                         break;
 
+                case ACPI_TYPE_BUFFER:
+
+                        /* Buffer arguments may not be evaluated at this point */
+
+                        status = acpi_ds_get_buffer_arguments(temp_desc);
+                        value = temp_desc->buffer.length;
+                        break;
+
                 case ACPI_TYPE_PACKAGE:
+
+                        /* Package arguments may not be evaluated at this point */
+
+                        status = acpi_ds_get_package_arguments(temp_desc);
                         value = temp_desc->package.count;
                         break;
 
                 default:
                         ACPI_ERROR((AE_INFO,
-                                    "Operand is not Buf/Int/Str/Pkg - found type %s",
+                                    "Operand must be Buffer/Integer/String/Package - found type %s",
                                     acpi_ut_get_type_name(type)));
                         status = AE_AML_OPERAND_TYPE;
                         goto cleanup;
                 }
 
+                if (ACPI_FAILURE(status)) {
+                        goto cleanup;
+                }
+
                 /*
                  * Now that we have the size of the object, create a result
                  * object to hold the value
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 17e652e65379..8e8bbb6ccebd 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -241,10 +241,6 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
                 goto cleanup;
         }
 
-        /* Return the remainder */
-
-        walk_state->result_obj = return_desc1;
-
       cleanup:
         /*
          * Since the remainder is not returned indirectly, remove a reference to
@@ -259,6 +255,12 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
                 acpi_ut_remove_reference(return_desc1);
         }
 
+        /* Save return object (the remainder) on success */
+
+        else {
+                walk_state->result_obj = return_desc1;
+        }
+
         return_ACPI_STATUS(status);
 }
 
@@ -490,6 +492,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
         if (ACPI_FAILURE(status)) {
                 acpi_ut_remove_reference(return_desc);
+                walk_state->result_obj = NULL;
         }
 
         return_ACPI_STATUS(status);
@@ -583,8 +586,6 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
                 return_desc->integer.value = ACPI_INTEGER_MAX;
         }
 
-        walk_state->result_obj = return_desc;
-
       cleanup:
 
         /* Delete return object on error */
@@ -593,5 +594,11 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
                 acpi_ut_remove_reference(return_desc);
         }
 
+        /* Save return object on success */
+
+        else {
+                walk_state->result_obj = return_desc;
+        }
+
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 7fe67cf82cee..9cb4197681af 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,6 +260,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         if (ACPI_FAILURE(status) || walk_state->result_obj) {
                 acpi_ut_remove_reference(return_desc);
+                walk_state->result_obj = NULL;
         }
 
         /* Set the return object and exit */
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index bd80a9cb3d65..67d48737af53 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -322,8 +322,6 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                 goto cleanup;
         }
 
-        walk_state->result_obj = return_desc;
-
       cleanup:
 
         /* Delete return object on error */
@@ -332,5 +330,11 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                 acpi_ut_remove_reference(return_desc);
         }
 
+        /* Save return object on success */
+
+        else {
+                walk_state->result_obj = return_desc;
+        }
+
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index efe5d4b461a4..3a2f8cd4c62a 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -412,6 +412,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
 acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
 {
         union acpi_operand_object *obj_desc;
+        union acpi_operand_object *second_desc = NULL;
         u32 type;
         acpi_status status;
 
@@ -494,6 +495,20 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                                   obj_desc->field.access_byte_width,
                                   obj_desc->bank_field.region_obj,
                                   obj_desc->bank_field.bank_obj));
+
+                /*
+                 * Remember location in AML stream of the field unit
+                 * opcode and operands -- since the bank_value
+                 * operands must be evaluated.
+                 */
+                second_desc = obj_desc->common.next_object;
+                second_desc->extra.aml_start =
+                    ((union acpi_parse_object *)(info->data_register_node))->
+                    named.data;
+                second_desc->extra.aml_length =
+                    ((union acpi_parse_object *)(info->data_register_node))->
+                    named.length;
+
                 break;
 
         case ACPI_TYPE_LOCAL_INDEX_FIELD:
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 3f51b7e84a17..7cd8bb54fa01 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -160,7 +160,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                 if (!mem_info->mapped_logical_address) {
                         ACPI_ERROR((AE_INFO,
                                     "Could not map memory at %8.8X%8.8X, size %X",
-                                    ACPI_FORMAT_UINT64(address),
+                                    ACPI_FORMAT_NATIVE_UINT(address),
                                     (u32) window_size));
                         mem_info->mapped_length = 0;
                         return_ACPI_STATUS(AE_NO_MEMORY);
@@ -182,7 +182,8 @@ acpi_ex_system_memory_space_handler(u32 function,
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
-                          bit_width, function, ACPI_FORMAT_UINT64(address)));
+                          bit_width, function,
+                          ACPI_FORMAT_NATIVE_UINT(address)));
 
         /*
          * Perform the memory read or write
@@ -284,7 +285,8 @@ acpi_ex_system_io_space_handler(u32 function,
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n",
-                          bit_width, function, ACPI_FORMAT_UINT64(address)));
+                          bit_width, function,
+                          ACPI_FORMAT_NATIVE_UINT(address)));
 
         /* Decode the function parameter */
 
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 2b3a01cc4929..5596f42c9676 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
          * Several object types require no further processing:
          * 1) Device/Thermal objects don't have a "real" subobject, return the Node
          * 2) Method locals and arguments have a pseudo-Node
+         * 3) 10/2007: Added method type to assist with Package construction.
          */
         if ((entry_type == ACPI_TYPE_DEVICE) ||
             (entry_type == ACPI_TYPE_THERMAL) ||
+            (entry_type == ACPI_TYPE_METHOD) ||
             (node->flags & (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) {
                 return_ACPI_STATUS(AE_OK);
         }
@@ -214,7 +216,6 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                 /* For these objects, just return the object attached to the Node */
 
         case ACPI_TYPE_MUTEX:
-        case ACPI_TYPE_METHOD:
         case ACPI_TYPE_POWER:
         case ACPI_TYPE_PROCESSOR:
         case ACPI_TYPE_EVENT:
@@ -238,13 +239,12 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_LOCAL_REFERENCE:
 
                 switch (source_desc->reference.opcode) {
-                case AML_LOAD_OP:
+                case AML_LOAD_OP:       /* This is a ddb_handle */
+                case AML_REF_OF_OP:
+                case AML_INDEX_OP:
 
-                        /* This is a ddb_handle */
                         /* Return an additional reference to the object */
 
-                case AML_REF_OF_OP:
-
                         obj_desc = source_desc;
                         acpi_ut_add_reference(obj_desc);
                         break;
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 6c64e55dab0e..b35f7c817acf 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 {
         acpi_status status = AE_OK;
         union acpi_operand_object *stack_desc;
-        void *temp_node;
         union acpi_operand_object *obj_desc = NULL;
         u16 opcode;
 
@@ -156,23 +155,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                 opcode = stack_desc->reference.opcode;
 
                 switch (opcode) {
-                case AML_NAME_OP:
-
-                        /*
-                         * Convert name reference to a namespace node
-                         * Then, acpi_ex_resolve_node_to_value can be used to get the value
-                         */
-                        temp_node = stack_desc->reference.object;
-
-                        /* Delete the Reference Object */
-
-                        acpi_ut_remove_reference(stack_desc);
-
-                        /* Return the namespace node */
-
-                        (*stack_ptr) = temp_node;
-                        break;
-
                 case AML_LOCAL_OP:
                 case AML_ARG_OP:
 
@@ -207,15 +189,25 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                         switch (stack_desc->reference.target_type) {
                         case ACPI_TYPE_BUFFER_FIELD:
 
-                                /* Just return - leave the Reference on the stack */
+                                /* Just return - do not dereference */
                                 break;
 
                         case ACPI_TYPE_PACKAGE:
 
+                                /* If method call or copy_object - do not dereference */
+
+                                if ((walk_state->opcode ==
+                                     AML_INT_METHODCALL_OP)
+                                    || (walk_state->opcode == AML_COPY_OP)) {
+                                        break;
+                                }
+
+                                /* Otherwise, dereference the package_index to a package element */
+
                                 obj_desc = *stack_desc->reference.where;
                                 if (obj_desc) {
                                         /*
-                                         * Valid obj descriptor, copy pointer to return value
+                                         * Valid object descriptor, copy pointer to return value
                                          * (i.e., dereference the package index)
                                          * Delete the ref object, increment the returned object
                                          */
@@ -224,11 +216,11 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                         *stack_ptr = obj_desc;
                                 } else {
                                         /*
-                                         * A NULL object descriptor means an unitialized element of
+                                         * A NULL object descriptor means an uninitialized element of
                                          * the package, can't dereference it
                                          */
                                         ACPI_ERROR((AE_INFO,
-                                                    "Attempt to deref an Index to NULL pkg element Idx=%p",
+                                                    "Attempt to dereference an Index to NULL package element Idx=%p",
                                                     stack_desc));
                                         status = AE_AML_UNINITIALIZED_ELEMENT;
                                 }
@@ -239,7 +231,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                 /* Invalid reference object */
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Unknown TargetType %X in Index/Reference obj %p",
+                                            "Unknown TargetType %X in Index/Reference object %p",
                                             stack_desc->reference.target_type,
                                             stack_desc));
                                 status = AE_AML_INTERNAL;
@@ -251,7 +243,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                 case AML_DEBUG_OP:
                 case AML_LOAD_OP:
 
-                        /* Just leave the object as-is */
+                        /* Just leave the object as-is, do not dereference */
 
                         break;
 
@@ -390,10 +382,10 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
         }
 
         /*
-         * For reference objects created via the ref_of or Index operators,
-         * we need to get to the base object (as per the ACPI specification
-         * of the object_type and size_of operators). This means traversing
-         * the list of possibly many nested references.
+         * For reference objects created via the ref_of, Index, or Load/load_table
+         * operators, we need to get to the base object (as per the ACPI
+         * specification of the object_type and size_of operators). This means
+         * traversing the list of possibly many nested references.
          */
         while (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REFERENCE) {
                 switch (obj_desc->reference.opcode) {
@@ -463,6 +455,11 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
                         }
                         break;
 
+                case AML_LOAD_OP:
+
+                        type = ACPI_TYPE_DDB_HANDLE;
+                        goto exit;
+
                 case AML_LOCAL_OP:
                 case AML_ARG_OP:
 
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 09d897b3f6d5..73e29e566a70 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -137,7 +137,6 @@ acpi_ex_resolve_operands(u16 opcode,
         union acpi_operand_object *obj_desc;
         acpi_status status = AE_OK;
         u8 object_type;
-        void *temp_node;
         u32 arg_types;
         const struct acpi_opcode_info *op_info;
         u32 this_arg_type;
@@ -239,7 +238,6 @@ acpi_ex_resolve_operands(u16 opcode,
 
                                         /*lint -fallthrough */
 
-                                case AML_NAME_OP:
                                 case AML_INDEX_OP:
                                 case AML_REF_OF_OP:
                                 case AML_ARG_OP:
@@ -332,15 +330,6 @@ acpi_ex_resolve_operands(u16 opcode,
                         if (ACPI_FAILURE(status)) {
                                 return_ACPI_STATUS(status);
                         }
-
-                        if (obj_desc->reference.opcode == AML_NAME_OP) {
-
-                                /* Convert a named reference to the actual named object */
-
-                                temp_node = obj_desc->reference.object;
-                                acpi_ut_remove_reference(obj_desc);
-                                (*stack_ptr) = temp_node;
-                        }
                         goto next_operand;
 
                 case ARGI_DATAREFOBJ:   /* Store operator only */
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index f4b69a637820..76c875bc3154 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,8 +84,12 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 
         ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
 
-        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
-                              level, " "));
+        /* Print line header as long as we are not in the middle of an object display */
+
+        if (!((level > 0) && index == 0)) {
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
+                                      level, " "));
+        }
 
         /* Display index for package output only */
 
@@ -95,12 +99,12 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
         }
 
         if (!source_desc) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "<Null Object>\n"));
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[Null Object]\n"));
                 return_VOID;
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_OPERAND) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%s: ",
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%s ",
                                       acpi_ut_get_object_type_name
                                       (source_desc)));
 
@@ -123,6 +127,8 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                 return_VOID;
         }
 
+        /* source_desc is of type ACPI_DESC_TYPE_OPERAND */
+
         switch (ACPI_GET_OBJECT_TYPE(source_desc)) {
         case ACPI_TYPE_INTEGER:
 
@@ -147,7 +153,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                                       (u32) source_desc->buffer.length));
                 ACPI_DUMP_BUFFER(source_desc->buffer.pointer,
                                  (source_desc->buffer.length <
-                                  32) ? source_desc->buffer.length : 32);
+                                  256) ? source_desc->buffer.length : 256);
                 break;
 
         case ACPI_TYPE_STRING:
@@ -160,7 +166,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
         case ACPI_TYPE_PACKAGE:
 
                 ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
-                                      "[0x%.2X Elements]\n",
+                                      "[Contains 0x%.2X Elements]\n",
                                       source_desc->package.count));
 
                 /* Output the entire contents of the package */
@@ -180,12 +186,59 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                                               (source_desc->reference.opcode),
                                               source_desc->reference.offset));
                 } else {
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[%s]\n",
+                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[%s]",
                                               acpi_ps_get_opcode_name
                                               (source_desc->reference.opcode)));
                 }
 
-                if (source_desc->reference.object) {
+                if (source_desc->reference.opcode == AML_LOAD_OP) {     /* Load and load_table */
+                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
+                                              " Table OwnerId %p\n",
+                                              source_desc->reference.object));
+                        break;
+                }
+
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "  "));
+
+                /* Check for valid node first, then valid object */
+
+                if (source_desc->reference.node) {
+                        if (ACPI_GET_DESCRIPTOR_TYPE
+                            (source_desc->reference.node) !=
+                            ACPI_DESC_TYPE_NAMED) {
+                                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
+                                                      " %p - Not a valid namespace node\n",
+                                                      source_desc->reference.
+                                                      node));
+                        } else {
+                                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
+                                                      "Node %p [%4.4s] ",
+                                                      source_desc->reference.
+                                                      node,
+                                                      (source_desc->reference.
+                                                       node)->name.ascii));
+
+                                switch ((source_desc->reference.node)->type) {
+
+                                        /* These types have no attached object */
+
+                                case ACPI_TYPE_DEVICE:
+                                        acpi_os_printf("Device\n");
+                                        break;
+
+                                case ACPI_TYPE_THERMAL:
+                                        acpi_os_printf("Thermal Zone\n");
+                                        break;
+
+                                default:
+                                        acpi_ex_do_debug_object((source_desc->
+                                                                 reference.
+                                                                 node)->object,
+                                                                level + 4, 0);
+                                        break;
+                                }
+                        }
+                } else if (source_desc->reference.object) {
                         if (ACPI_GET_DESCRIPTOR_TYPE
                             (source_desc->reference.object) ==
                             ACPI_DESC_TYPE_NAMED) {
@@ -198,18 +251,13 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                                 acpi_ex_do_debug_object(source_desc->reference.
                                                         object, level + 4, 0);
                         }
-                } else if (source_desc->reference.node) {
-                        acpi_ex_do_debug_object((source_desc->reference.node)->
-                                                object, level + 4, 0);
                 }
                 break;
 
         default:
 
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%p %s\n",
-                                      source_desc,
-                                      acpi_ut_get_object_type_name
-                                      (source_desc)));
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "%p\n",
+                                      source_desc));
                 break;
         }
 
@@ -313,7 +361,6 @@ acpi_ex_store(union acpi_operand_object *source_desc,
          * 4) Store to the debug object
          */
         switch (ref_desc->reference.opcode) {
-        case AML_NAME_OP:
         case AML_REF_OF_OP:
 
                 /* Storing an object into a Name "container" */
@@ -415,11 +462,24 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                  */
                 obj_desc = *(index_desc->reference.where);
 
-                status =
-                    acpi_ut_copy_iobject_to_iobject(source_desc, &new_desc,
-                                                    walk_state);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                if (ACPI_GET_OBJECT_TYPE(source_desc) ==
+                    ACPI_TYPE_LOCAL_REFERENCE
+                    && source_desc->reference.opcode == AML_LOAD_OP) {
+
+                        /* This is a DDBHandle, just add a reference to it */
+
+                        acpi_ut_add_reference(source_desc);
+                        new_desc = source_desc;
+                } else {
+                        /* Normal object, copy it */
+
+                        status =
+                            acpi_ut_copy_iobject_to_iobject(source_desc,
+                                                            &new_desc,
+                                                            walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
                 }
 
                 if (obj_desc) {
@@ -571,10 +631,17 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
 
         /* If no implicit conversion, drop into the default case below */
 
-        if ((!implicit_conversion) || (walk_state->opcode == AML_COPY_OP)) {
-
-                /* Force execution of default (no implicit conversion) */
-
+        if ((!implicit_conversion) ||
+            ((walk_state->opcode == AML_COPY_OP) &&
+             (target_type != ACPI_TYPE_LOCAL_REGION_FIELD) &&
+             (target_type != ACPI_TYPE_LOCAL_BANK_FIELD) &&
+             (target_type != ACPI_TYPE_LOCAL_INDEX_FIELD))) {
+                /*
+                 * Force execution of default (no implicit conversion). Note:
+                 * copy_object does not perform an implicit conversion, as per the ACPI
+                 * spec -- except in case of region/bank/index fields -- because these
+                 * objects must retain their original type permanently.
+                 */
                 target_type = ACPI_TYPE_ANY;
         }
 
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 1d622c625c64..a6d2168b81f9 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 8233d40178ee..9a75ff09fb0c 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 9460baff3032..68990f1df371 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,6 @@
 
 #include <acpi/acpi.h>
 #include <acpi/acinterp.h>
-#include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exsystem")
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 6b0aeccbb69b..86c03880b523 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,6 @@
 #include <acpi/acpi.h>
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
-#include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exutils")
@@ -217,9 +216,10 @@ void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
 
         /*
          * Object must be a valid number and we must be executing
-         * a control method
+         * a control method. NS node could be there for AML_INT_NAMEPATH_OP.
          */
         if ((!obj_desc) ||
+            (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) ||
             (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER)) {
                 return;
         }
@@ -240,72 +240,73 @@ void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
  * PARAMETERS:  field_flags           - Flags with Lock rule:
  *                                      always_lock or never_lock
  *
- * RETURN:      TRUE/FALSE indicating whether the lock was actually acquired
+ * RETURN:      None
  *
- * DESCRIPTION: Obtain the global lock and keep track of this fact via two
- *              methods.  A global variable keeps the state of the lock, and
- *              the state is returned to the caller.
+ * DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field
+ *              flags specifiy that it is to be obtained before field access.
  *
  ******************************************************************************/
 
-u8 acpi_ex_acquire_global_lock(u32 field_flags)
+void acpi_ex_acquire_global_lock(u32 field_flags)
 {
-        u8 locked = FALSE;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(ex_acquire_global_lock);
 
-        /* Only attempt lock if the always_lock bit is set */
+        /* Only use the lock if the always_lock bit is set */
+
+        if (!(field_flags & AML_FIELD_LOCK_RULE_MASK)) {
+                return_VOID;
+        }
 
-        if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
+        /* Attempt to get the global lock, wait forever */
 
-                /* We should attempt to get the lock, wait forever */
+        status = acpi_ex_acquire_mutex_object(ACPI_WAIT_FOREVER,
+                                              acpi_gbl_global_lock_mutex,
+                                              acpi_os_get_thread_id());
 
-                status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
-                if (ACPI_SUCCESS(status)) {
-                        locked = TRUE;
-                } else {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Could not acquire Global Lock"));
-                }
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not acquire Global Lock"));
         }
 
-        return_UINT8(locked);
+        return_VOID;
 }
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_release_global_lock
  *
- * PARAMETERS:  locked_by_me    - Return value from corresponding call to
- *                                acquire_global_lock.
+ * PARAMETERS:  field_flags           - Flags with Lock rule:
+ *                                      always_lock or never_lock
  *
  * RETURN:      None
  *
- * DESCRIPTION: Release the global lock if it is locked.
+ * DESCRIPTION: Release the ACPI hardware Global Lock
  *
  ******************************************************************************/
 
-void acpi_ex_release_global_lock(u8 locked_by_me)
+void acpi_ex_release_global_lock(u32 field_flags)
 {
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(ex_release_global_lock);
 
-        /* Only attempt unlock if the caller locked it */
+        /* Only use the lock if the always_lock bit is set */
 
-        if (locked_by_me) {
+        if (!(field_flags & AML_FIELD_LOCK_RULE_MASK)) {
+                return_VOID;
+        }
 
-                /* OK, now release the lock */
+        /* Release the global lock */
 
-                status = acpi_ev_release_global_lock();
-                if (ACPI_FAILURE(status)) {
+        status = acpi_ex_release_mutex_object(acpi_gbl_global_lock_mutex);
+        if (ACPI_FAILURE(status)) {
 
-                        /* Report the error, but there isn't much else we can do */
+                /* Report the error, but there isn't much else we can do */
 
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Could not release ACPI Global Lock"));
-                }
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not release Global Lock"));
         }
 
         return_VOID;
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 194077ab9b85..6cf10cbc1eee 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -256,24 +256,23 @@ static int acpi_fan_add(struct acpi_device *device)
                 result = PTR_ERR(cdev);
                 goto end;
         }
-        if (cdev) {
-                printk(KERN_INFO PREFIX
-                        "%s is registered as cooling_device%d\n",
-                        device->dev.bus_id, cdev->id);
-
-                acpi_driver_data(device) = cdev;
-                result = sysfs_create_link(&device->dev.kobj,
-                                           &cdev->device.kobj,
-                                           "thermal_cooling");
-                if (result)
-                        return result;
-
-                result = sysfs_create_link(&cdev->device.kobj,
-                                           &device->dev.kobj,
-                                           "device");
-                if (result)
-                        return result;
-        }
+
+        printk(KERN_INFO PREFIX
+                "%s is registered as cooling_device%d\n",
+                device->dev.bus_id, cdev->id);
+
+        acpi_driver_data(device) = cdev;
+        result = sysfs_create_link(&device->dev.kobj,
+                                   &cdev->device.kobj,
+                                   "thermal_cooling");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+
+        result = sysfs_create_link(&cdev->device.kobj,
+                                   &device->dev.kobj,
+                                   "device");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
 
         result = acpi_fan_add_fs(device);
         if (result)
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index eda0978b57c6..06f8634fe58b 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -142,6 +142,7 @@ EXPORT_SYMBOL(acpi_get_physical_device);
 
 static int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
+        struct acpi_device *acpi_dev;
         acpi_status status;
 
         if (dev->archdata.acpi_handle) {
@@ -157,6 +158,16 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
         }
         dev->archdata.acpi_handle = handle;
 
+        status = acpi_bus_get_device(handle, &acpi_dev);
+        if (!ACPI_FAILURE(status)) {
+                int ret;
+
+                ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
+                                "firmware_node");
+                ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
+                                "physical_node");
+        }
+
         return 0;
 }
 
@@ -165,8 +176,17 @@ static int acpi_unbind_one(struct device *dev)
         if (!dev->archdata.acpi_handle)
                 return 0;
         if (dev == acpi_get_physical_device(dev->archdata.acpi_handle)) {
+                struct acpi_device *acpi_dev;
+
                 /* acpi_get_physical_device increase refcnt by one */
                 put_device(dev);
+
+                if (!acpi_bus_get_device(dev->archdata.acpi_handle,
+                                        &acpi_dev)) {
+                        sysfs_remove_link(&dev->kobj, "firmware_node");
+                        sysfs_remove_link(&acpi_dev->dev.kobj, "physical_node");
+                }
+
                 acpi_detach_data(dev->archdata.acpi_handle,
                                  acpi_glue_data_handler);
                 dev->archdata.acpi_handle = NULL;
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 6031ca13dd2f..816894ea839e 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 117a05cadaaa..14bc4f456ae8 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 73f9c5fb1ba7..ddf792adcf96 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 4290e0193097..d9937e05ec6a 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,9 +70,10 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
 
         /* Get the FACS */
 
-        status =
-            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
-                                    (struct acpi_table_header **)&facs);
+        status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                         ACPI_CAST_INDIRECT_PTR(struct
+                                                                acpi_table_header,
+                                                                &facs));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -124,9 +125,10 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 
         /* Get the FACS */
 
-        status =
-            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
-                                    (struct acpi_table_header **)&facs);
+        status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                         ACPI_CAST_INDIRECT_PTR(struct
+                                                                acpi_table_header,
+                                                                &facs));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index c32eab696acd..b53d575491b9 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 57faf598bad8..c39a7f68b889 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -208,8 +208,7 @@ acpi_status acpi_ns_root_initialize(void)
                                 /* Special case for ACPI Global Lock */
 
                                 if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
-                                        acpi_gbl_global_lock_mutex =
-                                            obj_desc->mutex.os_mutex;
+                                        acpi_gbl_global_lock_mutex = obj_desc;
 
                                         /* Create additional counting semaphore for global lock */
 
@@ -582,44 +581,68 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         return_ACPI_STATUS(status);
                 }
 
-                /*
-                 * Sanity typecheck of the target object:
-                 *
-                 * If 1) This is the last segment (num_segments == 0)
-                 *    2) And we are looking for a specific type
-                 *       (Not checking for TYPE_ANY)
-                 *    3) Which is not an alias
-                 *    4) Which is not a local type (TYPE_SCOPE)
-                 *    5) And the type of target object is known (not TYPE_ANY)
-                 *    6) And target object does not match what we are looking for
-                 *
-                 * Then we have a type mismatch.  Just warn and ignore it.
-                 */
-                if ((num_segments == 0) &&
-                    (type_to_check_for != ACPI_TYPE_ANY) &&
-                    (type_to_check_for != ACPI_TYPE_LOCAL_ALIAS) &&
-                    (type_to_check_for != ACPI_TYPE_LOCAL_METHOD_ALIAS) &&
-                    (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) &&
-                    (this_node->type != ACPI_TYPE_ANY) &&
-                    (this_node->type != type_to_check_for)) {
-
-                        /* Complain about a type mismatch */
-
-                        ACPI_WARNING((AE_INFO,
-                                      "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
-                                      ACPI_CAST_PTR(char, &simple_name),
-                                      acpi_ut_get_type_name(this_node->type),
-                                      acpi_ut_get_type_name
-                                      (type_to_check_for)));
+                /* More segments to follow? */
+
+                if (num_segments > 0) {
+                        /*
+                         * If we have an alias to an object that opens a scope (such as a
+                         * device or processor), we need to dereference the alias here so that
+                         * we can access any children of the original node (via the remaining
+                         * segments).
+                         */
+                        if (this_node->type == ACPI_TYPE_LOCAL_ALIAS) {
+                                if (acpi_ns_opens_scope
+                                    (((struct acpi_namespace_node *)this_node->
+                                      object)->type)) {
+                                        this_node =
+                                            (struct acpi_namespace_node *)
+                                            this_node->object;
+                                }
+                        }
                 }
 
-                /*
-                 * If this is the last name segment and we are not looking for a
-                 * specific type, but the type of found object is known, use that type
-                 * to see if it opens a scope.
-                 */
-                if ((num_segments == 0) && (type == ACPI_TYPE_ANY)) {
-                        type = this_node->type;
+                /* Special handling for the last segment (num_segments == 0) */
+
+                else {
+                        /*
+                         * Sanity typecheck of the target object:
+                         *
+                         * If 1) This is the last segment (num_segments == 0)
+                         *    2) And we are looking for a specific type
+                         *       (Not checking for TYPE_ANY)
+                         *    3) Which is not an alias
+                         *    4) Which is not a local type (TYPE_SCOPE)
+                         *    5) And the type of target object is known (not TYPE_ANY)
+                         *    6) And target object does not match what we are looking for
+                         *
+                         * Then we have a type mismatch. Just warn and ignore it.
+                         */
+                        if ((type_to_check_for != ACPI_TYPE_ANY) &&
+                            (type_to_check_for != ACPI_TYPE_LOCAL_ALIAS) &&
+                            (type_to_check_for != ACPI_TYPE_LOCAL_METHOD_ALIAS)
+                            && (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE)
+                            && (this_node->type != ACPI_TYPE_ANY)
+                            && (this_node->type != type_to_check_for)) {
+
+                                /* Complain about a type mismatch */
+
+                                ACPI_WARNING((AE_INFO,
+                                              "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
+                                              ACPI_CAST_PTR(char, &simple_name),
+                                              acpi_ut_get_type_name(this_node->
+                                                                    type),
+                                              acpi_ut_get_type_name
+                                              (type_to_check_for)));
+                        }
+
+                        /*
+                         * If this is the last name segment and we are not looking for a
+                         * specific type, but the type of found object is known, use that type
+                         * to (later) see if it opens a scope.
+                         */
+                        if (type == ACPI_TYPE_ANY) {
+                                type = this_node->type;
+                        }
                 }
 
                 /* Point to next name segment and make this node current */
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 1d693d8ad2d8..3a1740ac2edc 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 1fc4f86676e1..5445751b8a3e 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,7 +249,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                         acpi_os_printf("ID %X Len %.4X Addr %p\n",
                                        obj_desc->processor.proc_id,
                                        obj_desc->processor.length,
-                                       (char *)obj_desc->processor.address);
+                                       ACPI_CAST_PTR(void,
+                                                     obj_desc->processor.
+                                                     address));
                         break;
 
                 case ACPI_TYPE_DEVICE:
@@ -320,9 +322,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                                                                space_id));
                         if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
                                 acpi_os_printf(" Addr %8.8X%8.8X Len %.4X\n",
-                                               ACPI_FORMAT_UINT64(obj_desc->
-                                                                  region.
-                                                                  address),
+                                               ACPI_FORMAT_NATIVE_UINT
+                                               (obj_desc->region.address),
                                                obj_desc->region.length);
                         } else {
                                 acpi_os_printf
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 5097e167939e..428f50fde11a 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 97b2ac57c16b..14bdfa92bea0 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 33db2241044e..6d6d930c8e18 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -244,6 +244,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                 info->field_count++;
                 break;
 
+        case ACPI_TYPE_LOCAL_BANK_FIELD:
+                info->field_count++;
+                break;
+
         case ACPI_TYPE_BUFFER:
                 info->buffer_count++;
                 break;
@@ -287,6 +291,12 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                 status = acpi_ds_get_buffer_field_arguments(obj_desc);
                 break;
 
+        case ACPI_TYPE_LOCAL_BANK_FIELD:
+
+                info->field_init++;
+                status = acpi_ds_get_bank_field_arguments(obj_desc);
+                break;
+
         case ACPI_TYPE_BUFFER:
 
                 info->buffer_init++;
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index d4f9654fd20f..2c92f6cf5ce1 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,11 +107,11 @@ acpi_ns_load_table(acpi_native_uint table_index,
                 goto unlock;
         }
 
-        status = acpi_ns_parse_table(table_index, node->child);
+        status = acpi_ns_parse_table(table_index, node);
         if (ACPI_SUCCESS(status)) {
                 acpi_tb_set_table_loaded_flag(table_index, TRUE);
         } else {
-                acpi_tb_release_owner_id(table_index);
+                (void)acpi_tb_release_owner_id(table_index);
         }
 
       unlock:
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index cbd94af08cc5..cffef1bcbdbc 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -180,6 +180,12 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
         next_node = node;
 
         while (next_node && (next_node != acpi_gbl_root_node)) {
+                if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid NS Node (%p) while traversing path",
+                                    next_node));
+                        return 0;
+                }
                 size += ACPI_PATH_SEGMENT_LENGTH;
                 next_node = acpi_ns_get_parent_node(next_node);
         }
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index d9d7377bc6e6..15fe09e24f71 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index e696aa847990..46a79b0103b6 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,8 @@ ACPI_MODULE_NAME("nsparse")
  ******************************************************************************/
 acpi_status
 acpi_ns_one_complete_parse(acpi_native_uint pass_number,
-                           acpi_native_uint table_index)
+                           acpi_native_uint table_index,
+                           struct acpi_namespace_node * start_node)
 {
         union acpi_parse_object *parse_root;
         acpi_status status;
@@ -111,14 +112,25 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
                 aml_start = (u8 *) table + sizeof(struct acpi_table_header);
                 aml_length = table->length - sizeof(struct acpi_table_header);
                 status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
-                                               aml_start, aml_length, NULL,
-                                               (u8) pass_number);
+                                               aml_start, (u32) aml_length,
+                                               NULL, (u8) pass_number);
         }
 
         if (ACPI_FAILURE(status)) {
                 acpi_ds_delete_walk_state(walk_state);
-                acpi_ps_delete_parse_tree(parse_root);
-                return_ACPI_STATUS(status);
+                goto cleanup;
+        }
+
+        /* start_node is the default location to load the table */
+
+        if (start_node && start_node != acpi_gbl_root_node) {
+                status =
+                    acpi_ds_scope_stack_push(start_node, ACPI_TYPE_METHOD,
+                                             walk_state);
+                if (ACPI_FAILURE(status)) {
+                        acpi_ds_delete_walk_state(walk_state);
+                        goto cleanup;
+                }
         }
 
         /* Parse the AML */
@@ -127,6 +139,7 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
                           (unsigned)pass_number));
         status = acpi_ps_parse_aml(walk_state);
 
+      cleanup:
         acpi_ps_delete_parse_tree(parse_root);
         return_ACPI_STATUS(status);
 }
@@ -163,7 +176,9 @@ acpi_ns_parse_table(acpi_native_uint table_index,
          * performs another complete parse of the AML.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
-        status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, table_index);
+        status =
+            acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, table_index,
+                                       start_node);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -178,7 +193,9 @@ acpi_ns_parse_table(acpi_native_uint table_index,
          * parse objects are all cached.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 2\n"));
-        status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, table_index);
+        status =
+            acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, table_index,
+                                       start_node);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index e863be665ce8..8399276cba1e 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 90fd059615ff..64c039843ed2 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 280b8357c46c..3c905ce26d7d 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,9 +77,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct
 
                 /* It's really the parent's _scope_ that we want */
 
-                if (parent_node->child) {
-                        next_node = parent_node->child;
-                }
+                next_node = parent_node->child;
         }
 
         else {
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index b92133faf5b7..a8d549187c84 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -467,10 +467,13 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                 return (AE_CTRL_DEPTH);
         }
 
-        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
-
-                /* Don't examine children of the device if not present */
-
+        if (!(flags & ACPI_STA_DEVICE_PRESENT) &&
+            !(flags & ACPI_STA_DEVICE_FUNCTIONING)) {
+                /*
+                 * Don't examine the children of the device only when the
+                 * device is neither present nor functional. See ACPI spec,
+                 * description of _STA for more information.
+                 */
                 return (AE_CTRL_DEPTH);
         }
 
@@ -539,7 +542,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  *              value is returned to the caller.
  *
  *              This is a wrapper for walk_namespace, but the callback performs
- *              additional filtering. Please see acpi_get_device_callback.
+ *              additional filtering. Please see acpi_ns_get_device_callback.
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index b489781b22a8..a287ed550f54 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index faa375887201..2b375ee80cef 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index a498a6cc68fe..235a1386888a 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -742,6 +742,7 @@ EXPORT_SYMBOL(acpi_os_execute);
 void acpi_os_wait_events_complete(void *context)
 {
         flush_workqueue(kacpid_wq);
+        flush_workqueue(kacpi_notify_wq);
 }
 
 EXPORT_SYMBOL(acpi_os_wait_events_complete);
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index c2b9835c890b..f1e8bf65e24e 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,12 +230,12 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                           struct acpi_parse_state *parser_state,
                           union acpi_parse_object *arg, u8 possible_method_call)
 {
+        acpi_status status;
         char *path;
         union acpi_parse_object *name_op;
-        acpi_status status;
         union acpi_operand_object *method_desc;
         struct acpi_namespace_node *node;
-        union acpi_generic_state scope_info;
+        u8 *start = parser_state->aml;
 
         ACPI_FUNCTION_TRACE(ps_get_next_namepath);
 
@@ -249,25 +249,18 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(AE_OK);
         }
 
-        /* Setup search scope info */
-
-        scope_info.scope.node = NULL;
-        node = parser_state->start_node;
-        if (node) {
-                scope_info.scope.node = node;
-        }
-
         /*
-         * Lookup the name in the internal namespace. We don't want to add
-         * anything new to the namespace here, however, so we use MODE_EXECUTE.
+         * Lookup the name in the internal namespace, starting with the current
+         * scope. We don't want to add anything new to the namespace here,
+         * however, so we use MODE_EXECUTE.
          * Allow searching of the parent tree, but don't open a new scope -
          * we just want to lookup the object (must be mode EXECUTE to perform
          * the upsearch)
          */
-        status =
-            acpi_ns_lookup(&scope_info, path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
-                           ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
-                           NULL, &node);
+        status = acpi_ns_lookup(walk_state->scope_info, path,
+                                ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+                                ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
+                                NULL, &node);
 
         /*
          * If this name is a control method invocation, we must
@@ -275,6 +268,16 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
          */
         if (ACPI_SUCCESS(status) &&
             possible_method_call && (node->type == ACPI_TYPE_METHOD)) {
+                if (walk_state->op->common.aml_opcode == AML_UNLOAD_OP) {
+                        /*
+                         * acpi_ps_get_next_namestring has increased the AML pointer,
+                         * so we need to restore the saved AML pointer for method call.
+                         */
+                        walk_state->parser_state.aml = start;
+                        walk_state->arg_count = 1;
+                        acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);
+                        return_ACPI_STATUS(AE_OK);
+                }
 
                 /* This name is actually a control method invocation */
 
@@ -686,9 +689,29 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
                                 return_ACPI_STATUS(AE_NO_MEMORY);
                         }
 
-                        status =
-                            acpi_ps_get_next_namepath(walk_state, parser_state,
-                                                      arg, 0);
+                        /* To support super_name arg of Unload */
+
+                        if (walk_state->op->common.aml_opcode == AML_UNLOAD_OP) {
+                                status =
+                                    acpi_ps_get_next_namepath(walk_state,
+                                                              parser_state, arg,
+                                                              1);
+
+                                /*
+                                 * If the super_name arg of Unload is a method call,
+                                 * we have restored the AML pointer, just free this Arg
+                                 */
+                                if (arg->common.aml_opcode ==
+                                    AML_INT_METHODCALL_OP) {
+                                        acpi_ps_free_op(arg);
+                                        arg = NULL;
+                                }
+                        } else {
+                                status =
+                                    acpi_ps_get_next_namepath(walk_state,
+                                                              parser_state, arg,
+                                                              0);
+                        }
                 } else {
                         /* Single complex argument, nothing returned */
 
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index 773aee82fbb8..c06238e55d98 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -182,6 +182,7 @@ acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
         ACPI_FUNCTION_TRACE_PTR(ps_build_named_op, walk_state);
 
         unnamed_op->common.value.arg = NULL;
+        unnamed_op->common.arg_list_length = 0;
         unnamed_op->common.aml_opcode = walk_state->opcode;
 
         /*
@@ -241,7 +242,8 @@ acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
         acpi_ps_append_arg(*op, unnamed_op->common.value.arg);
         acpi_gbl_depth++;
 
-        if ((*op)->common.aml_opcode == AML_REGION_OP) {
+        if ((*op)->common.aml_opcode == AML_REGION_OP ||
+            (*op)->common.aml_opcode == AML_DATA_REGION_OP) {
                 /*
                  * Defer final parsing of an operation_region body, because we don't
                  * have enough info in the first pass to parse it correctly (i.e.,
@@ -280,6 +282,9 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
         acpi_status status = AE_OK;
         union acpi_parse_object *op;
         union acpi_parse_object *named_op = NULL;
+        union acpi_parse_object *parent_scope;
+        u8 argument_count;
+        const struct acpi_opcode_info *op_info;
 
         ACPI_FUNCTION_TRACE_PTR(ps_create_op, walk_state);
 
@@ -320,8 +325,32 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
                 op->named.length = 0;
         }
 
-        acpi_ps_append_arg(acpi_ps_get_parent_scope
-                           (&(walk_state->parser_state)), op);
+        if (walk_state->opcode == AML_BANK_FIELD_OP) {
+                /*
+                 * Backup to beginning of bank_field declaration
+                 * body_length is unknown until we parse the body
+                 */
+                op->named.data = aml_op_start;
+                op->named.length = 0;
+        }
+
+        parent_scope = acpi_ps_get_parent_scope(&(walk_state->parser_state));
+        acpi_ps_append_arg(parent_scope, op);
+
+        if (parent_scope) {
+                op_info =
+                    acpi_ps_get_opcode_info(parent_scope->common.aml_opcode);
+                if (op_info->flags & AML_HAS_TARGET) {
+                        argument_count =
+                            acpi_ps_get_argument_count(op_info->type);
+                        if (parent_scope->common.arg_list_length >
+                            argument_count) {
+                                op->common.flags |= ACPI_PARSEOP_TARGET;
+                        }
+                } else if (parent_scope->common.aml_opcode == AML_INCREMENT_OP) {
+                        op->common.flags |= ACPI_PARSEOP_TARGET;
+                }
+        }
 
         if (walk_state->descending_callback != NULL) {
                 /*
@@ -603,13 +632,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                         acpi_ps_pop_scope(&(walk_state->parser_state), op,
                                           &walk_state->arg_types,
                                           &walk_state->arg_count);
-
-                        if ((*op)->common.aml_opcode != AML_WHILE_OP) {
-                                status2 = acpi_ds_result_stack_pop(walk_state);
-                                if (ACPI_FAILURE(status2)) {
-                                        return_ACPI_STATUS(status2);
-                                }
-                        }
                 }
 
                 /* Close this iteration of the While loop */
@@ -640,10 +662,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                                 if (ACPI_FAILURE(status2)) {
                                         return_ACPI_STATUS(status2);
                                 }
-                                status2 = acpi_ds_result_stack_pop(walk_state);
-                                if (ACPI_FAILURE(status2)) {
-                                        return_ACPI_STATUS(status2);
-                                }
 
                                 acpi_ut_delete_generic_state
                                     (acpi_ut_pop_generic_state
@@ -1005,7 +1023,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                 acpi_gbl_depth--;
                         }
 
-                        if (op->common.aml_opcode == AML_REGION_OP) {
+                        if (op->common.aml_opcode == AML_REGION_OP ||
+                            op->common.aml_opcode == AML_DATA_REGION_OP) {
                                 /*
                                  * Skip parsing of control method or opregion body,
                                  * because we don't have enough info in the first pass
@@ -1030,6 +1049,16 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                             (u32) (parser_state->aml - op->named.data);
                 }
 
+                if (op->common.aml_opcode == AML_BANK_FIELD_OP) {
+                        /*
+                         * Backup to beginning of bank_field declaration
+                         *
+                         * body_length is unknown until we parse the body
+                         */
+                        op->named.length =
+                            (u32) (parser_state->aml - op->named.data);
+                }
+
                 /* This op complete, notify the dispatcher */
 
                 if (walk_state->ascending_callback != NULL) {
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 9296e86761d7..f425ab30eae8 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,9 @@
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psopcode")
 
+static const u8 acpi_gbl_argument_count[] =
+    { 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 6 };
+
 /*******************************************************************************
  *
  * NAME:        acpi_gbl_aml_op_info
@@ -59,6 +62,7 @@ ACPI_MODULE_NAME("psopcode")
  *              the operand type.
  *
  ******************************************************************************/
+
 /*
  * Summary of opcode types/flags
  *
@@ -176,6 +180,7 @@ ACPI_MODULE_NAME("psopcode")
         AML_CREATE_QWORD_FIELD_OP
 
  ******************************************************************************/
+
 /*
  * Master Opcode information table.  A summary of everything we know about each
  * opcode, all in one place.
@@ -515,9 +520,10 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  AML_TYPE_NAMED_FIELD,
                  AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 ACPI_TYPE_LOCAL_BANK_FIELD, AML_CLASS_NAMED_OBJECT,
                  AML_TYPE_NAMED_FIELD,
-                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD |
+                 AML_DEFER),
 
 /* Internal opcodes that map to invalid AML opcodes */
 
@@ -619,9 +625,9 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
 /* 7C */ ACPI_OP("DataTableRegion", ARGP_DATA_REGION_OP,
                  ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
-                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
                  AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                 AML_NSNODE | AML_NAMED),
+                 AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
                  ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
                  AML_TYPE_NAMED_NO_OBJ,
@@ -779,3 +785,25 @@ char *acpi_ps_get_opcode_name(u16 opcode)
 
 #endif
 }
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_get_argument_count
+ *
+ * PARAMETERS:  op_type             - Type associated with the AML opcode
+ *
+ * RETURN:      Argument count
+ *
+ * DESCRIPTION: Obtain the number of expected arguments for an AML opcode
+ *
+ ******************************************************************************/
+
+u8 acpi_ps_get_argument_count(u32 op_type)
+{
+
+        if (op_type <= AML_TYPE_EXEC_6A_0T_1R) {
+                return (acpi_gbl_argument_count[op_type]);
+        }
+
+        return (0);
+}
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 5d63f48e56b5..15e1702e48d6 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -205,6 +205,8 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,
                             || (op->common.parent->common.aml_opcode ==
                                 AML_PACKAGE_OP)
                             || (op->common.parent->common.aml_opcode ==
+                                AML_BANK_FIELD_OP)
+                            || (op->common.parent->common.aml_opcode ==
                                 AML_VAR_PACKAGE_OP)) {
                                 replacement_op =
                                     acpi_ps_alloc_op(AML_INT_RETURN_VALUE_OP);
@@ -349,19 +351,13 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
                 parser_state->aml = walk_state->aml_last_while;
                 walk_state->control_state->common.value = FALSE;
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_BREAK;
-                }
+                status = AE_CTRL_BREAK;
                 break;
 
         case AE_CTRL_CONTINUE:
 
                 parser_state->aml = walk_state->aml_last_while;
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_CONTINUE;
-                }
+                status = AE_CTRL_CONTINUE;
                 break;
 
         case AE_CTRL_PENDING:
@@ -383,10 +379,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
                  * Just close out this package
                  */
                 parser_state->aml = acpi_ps_get_next_package_end(parser_state);
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_PENDING;
-                }
+                status = AE_CTRL_PENDING;
                 break;
 
         case AE_CTRL_FALSE:
@@ -541,7 +534,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                         if ((status == AE_ALREADY_EXISTS) &&
                             (!walk_state->method_desc->method.mutex)) {
                                 ACPI_INFO((AE_INFO,
-                                           "Marking method %4.4s as Serialized",
+                                           "Marking method %4.4s as Serialized because of AE_ALREADY_EXISTS error",
                                            walk_state->method_node->name.
                                            ascii));
 
@@ -601,6 +594,30 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                                  * The object is deleted
                                  */
                                 if (!previous_walk_state->return_desc) {
+                                        /*
+                                         * In slack mode execution, if there is no return value
+                                         * we should implicitly return zero (0) as a default value.
+                                         */
+                                        if (acpi_gbl_enable_interpreter_slack &&
+                                            !previous_walk_state->
+                                            implicit_return_obj) {
+                                                previous_walk_state->
+                                                    implicit_return_obj =
+                                                    acpi_ut_create_internal_object
+                                                    (ACPI_TYPE_INTEGER);
+                                                if (!previous_walk_state->
+                                                    implicit_return_obj) {
+                                                        return_ACPI_STATUS
+                                                            (AE_NO_MEMORY);
+                                                }
+
+                                                previous_walk_state->
+                                                    implicit_return_obj->
+                                                    integer.value = 0;
+                                        }
+
+                                        /* Restart the calling control method */
+
                                         status =
                                             acpi_ds_restart_control_method
                                             (walk_state,
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index 77cfa4ed0cfe..ee50e67c9443 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index 966e7ea2a0c4..1dd355ddd182 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -171,6 +171,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
         while (arg) {
                 arg->common.parent = op;
                 arg = arg->common.next;
+
+                op->common.arg_list_length++;
         }
 }
 
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 8ca52002db55..7cf1f65cd5bb 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 49f9757434e4..8b86ad5a3201 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 94103bced75e..52581454c47c 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 21fc8bf0d31f..81e4f081a4ae 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -122,7 +122,7 @@ acpi_power_get_context(acpi_handle handle,
         }
 
         *resource = acpi_driver_data(device);
-        if (!resource)
+        if (!*resource)
                 return -ENODEV;
 
         return 0;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 5241e3ff5080..386e5aa48834 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -674,22 +674,21 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
                 result = PTR_ERR(pr->cdev);
                 goto end;
         }
-        if (pr->cdev) {
-                printk(KERN_INFO PREFIX
-                        "%s is registered as cooling_device%d\n",
-                        device->dev.bus_id, pr->cdev->id);
-
-                result = sysfs_create_link(&device->dev.kobj,
-                                           &pr->cdev->device.kobj,
-                                           "thermal_cooling");
-                if (result)
-                        return result;
-                result = sysfs_create_link(&pr->cdev->device.kobj,
-                                           &device->dev.kobj,
-                                           "device");
-                if (result)
-                        return result;
-        }
+
+        printk(KERN_INFO PREFIX
+                "%s is registered as cooling_device%d\n",
+                device->dev.bus_id, pr->cdev->id);
+
+        result = sysfs_create_link(&device->dev.kobj,
+                                   &pr->cdev->device.kobj,
+                                   "thermal_cooling");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+        result = sysfs_create_link(&pr->cdev->device.kobj,
+                                   &device->dev.kobj,
+                                   "device");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
 
         if (pr->flags.throttling) {
                 printk(KERN_INFO PREFIX "%s [%s] (supports",
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 789d4947ed31..2dd2c1f3a01c 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -847,6 +847,7 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr)
                 /* all processors need to support C1 */
                 pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
                 pr->power.states[ACPI_STATE_C1].valid = 1;
+                pr->power.states[ACPI_STATE_C1].entry_method = ACPI_CSTATE_HALT;
         }
         /* the C0 state only exists as a filler in our array */
         pr->power.states[ACPI_STATE_C0].valid = 1;
@@ -959,6 +960,9 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                                  cx.address);
                 }
 
+                if (cx.type == ACPI_STATE_C1) {
+                        cx.valid = 1;
+                }
 
                 obj = &(element->package.elements[2]);
                 if (obj->type != ACPI_TYPE_INTEGER)
@@ -1295,6 +1299,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
         int result = 0;
 
+        if (boot_option_idle_override)
+                return 0;
 
         if (!pr)
                 return -EINVAL;
@@ -1734,6 +1740,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
         int ret;
 
+        if (boot_option_idle_override)
+                return 0;
+
         if (!pr)
                 return -EINVAL;
 
@@ -1764,6 +1773,8 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
         struct proc_dir_entry *entry = NULL;
         unsigned int i;
 
+        if (boot_option_idle_override)
+                return 0;
 
         if (!first_run) {
                 dmi_check_system(processor_power_dmi_table);
@@ -1799,7 +1810,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
          * Note that we use previously set idle handler will be used on
          * platforms that only support C1.
          */
-        if ((pr->flags.power) && (!boot_option_idle_override)) {
+        if (pr->flags.power) {
 #ifdef CONFIG_CPU_IDLE
                 acpi_processor_setup_cpuidle(pr);
                 pr->power.dev.cpu = pr->id;
@@ -1835,8 +1846,11 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
+        if (boot_option_idle_override)
+                return 0;
+
 #ifdef CONFIG_CPU_IDLE
-        if ((pr->flags.power) && (!boot_option_idle_override))
+        if (pr->flags.power)
                 cpuidle_unregister_device(&pr->power.dev);
 #endif
         pr->flags.power_setup_done = 0;
diff --git a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c
index 271e61509eeb..7f96332822bf 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/resources/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 0dd2ce8a3475..8a112d11d491 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@ acpi_rs_stream_option_length(u32 resource_length, u32 minimum_total_length);
 
 static u8 acpi_rs_count_set_bits(u16 bit_field)
 {
-        u8 bits_set;
+        acpi_native_uint bits_set;
 
         ACPI_FUNCTION_ENTRY();
 
@@ -81,10 +81,10 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
 
                 /* Zero the least significant bit that is set */
 
-                bit_field &= (bit_field - 1);
+                bit_field &= (u16) (bit_field - 1);
         }
 
-        return (bits_set);
+        return ((u8) bits_set);
 }
 
 /*******************************************************************************
@@ -211,6 +211,24 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                  * variable-length fields
                  */
                 switch (resource->type) {
+                case ACPI_RESOURCE_TYPE_IRQ:
+
+                        /* Length can be 3 or 2 */
+
+                        if (resource->data.irq.descriptor_length == 2) {
+                                total_size--;
+                        }
+                        break;
+
+                case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+
+                        /* Length can be 1 or 0 */
+
+                        if (resource->data.irq.descriptor_length == 0) {
+                                total_size--;
+                        }
+                        break;
+
                 case ACPI_RESOURCE_TYPE_VENDOR:
                         /*
                          * Vendor Defined Resource:
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 50da494c3ee2..faddaee1bc07 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index 46da116a4030..6bbbb7b8941a 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,8 +87,10 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);
  *
  ******************************************************************************/
 
-struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
+struct acpi_rsdump_info acpi_rs_dump_irq[7] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.descriptor_length),
+         "Descriptor Length", NULL},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering",
          acpi_gbl_he_decode},
         {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
@@ -115,9 +117,11 @@ struct acpi_rsdump_info acpi_rs_dump_dma[6] = {
          NULL}
 };
 
-struct acpi_rsdump_info acpi_rs_dump_start_dpf[3] = {
+struct acpi_rsdump_info acpi_rs_dump_start_dpf[4] = {
         {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_start_dpf),
          "Start-Dependent-Functions", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(start_dpf.descriptor_length),
+         "Descriptor Length", NULL},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(start_dpf.compatibility_priority),
          "Compatibility Priority", acpi_gbl_config_decode},
         {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(start_dpf.performance_robustness),
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 2c2adb6292c1..3f0a1fedbe0e 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c
index b297bc3e4419..b66d42e7402e 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -185,7 +185,7 @@ struct acpi_rsconvert_info acpi_rs_convert_end_tag[2] = {
  *
  ******************************************************************************/
 
-struct acpi_rsconvert_info acpi_rs_get_start_dpf[5] = {
+struct acpi_rsconvert_info acpi_rs_get_start_dpf[6] = {
         {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_START_DEPENDENT,
          ACPI_RS_SIZE(struct acpi_resource_start_dependent),
          ACPI_RSC_TABLE_SIZE(acpi_rs_get_start_dpf)},
@@ -196,6 +196,12 @@ struct acpi_rsconvert_info acpi_rs_get_start_dpf[5] = {
          ACPI_ACCEPTABLE_CONFIGURATION,
          2},
 
+        /* Get the descriptor length (0 or 1 for Start Dpf descriptor) */
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.start_dpf.descriptor_length),
+         AML_OFFSET(start_dpf.descriptor_type),
+         0},
+
         /* All done if there is no flag byte present in the descriptor */
 
         {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 1},
@@ -219,7 +225,9 @@ struct acpi_rsconvert_info acpi_rs_get_start_dpf[5] = {
  *
  ******************************************************************************/
 
-struct acpi_rsconvert_info acpi_rs_set_start_dpf[6] = {
+struct acpi_rsconvert_info acpi_rs_set_start_dpf[10] = {
+        /* Start with a default descriptor of length 1 */
+
         {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_START_DEPENDENT,
          sizeof(struct aml_resource_start_dependent),
          ACPI_RSC_TABLE_SIZE(acpi_rs_set_start_dpf)},
@@ -236,6 +244,33 @@ struct acpi_rsconvert_info acpi_rs_set_start_dpf[6] = {
          AML_OFFSET(start_dpf.flags),
          2},
         /*
+         * All done if the output descriptor length is required to be 1
+         * (i.e., optimization to 0 bytes cannot be attempted)
+         */
+        {ACPI_RSC_EXIT_EQ, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.start_dpf.descriptor_length),
+         1},
+
+        /* Set length to 0 bytes (no flags byte) */
+
+        {ACPI_RSC_LENGTH, 0, 0,
+         sizeof(struct aml_resource_start_dependent_noprio)},
+
+        /*
+         * All done if the output descriptor length is required to be 0.
+         *
+         * TBD: Perhaps we should check for error if input flags are not
+         * compatible with a 0-byte descriptor.
+         */
+        {ACPI_RSC_EXIT_EQ, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.start_dpf.descriptor_length),
+         0},
+
+        /* Reset length to 1 byte (descriptor with flags byte) */
+
+        {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_start_dependent)},
+
+        /*
          * All done if flags byte is necessary -- if either priority value
          * is not ACPI_ACCEPTABLE_CONFIGURATION
          */
diff --git a/drivers/acpi/resources/rsirq.c b/drivers/acpi/resources/rsirq.c
index 5657f7b95039..a8805efc0366 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/resources/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ ACPI_MODULE_NAME("rsirq")
  * acpi_rs_get_irq
  *
  ******************************************************************************/
-struct acpi_rsconvert_info acpi_rs_get_irq[7] = {
+struct acpi_rsconvert_info acpi_rs_get_irq[8] = {
         {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_IRQ,
          ACPI_RS_SIZE(struct acpi_resource_irq),
          ACPI_RSC_TABLE_SIZE(acpi_rs_get_irq)},
@@ -69,6 +69,12 @@ struct acpi_rsconvert_info acpi_rs_get_irq[7] = {
          ACPI_EDGE_SENSITIVE,
          1},
 
+        /* Get the descriptor length (2 or 3 for IRQ descriptor) */
+
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.descriptor_length),
+         AML_OFFSET(irq.descriptor_type),
+         0},
+
         /* All done if no flag byte present in descriptor */
 
         {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3},
@@ -94,7 +100,9 @@ struct acpi_rsconvert_info acpi_rs_get_irq[7] = {
  *
  ******************************************************************************/
 
-struct acpi_rsconvert_info acpi_rs_set_irq[9] = {
+struct acpi_rsconvert_info acpi_rs_set_irq[13] = {
+        /* Start with a default descriptor of length 3 */
+
         {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_IRQ,
          sizeof(struct aml_resource_irq),
          ACPI_RSC_TABLE_SIZE(acpi_rs_set_irq)},
@@ -105,7 +113,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[9] = {
          AML_OFFSET(irq.irq_mask),
          ACPI_RS_OFFSET(data.irq.interrupt_count)},
 
-        /* Set the flags byte by default */
+        /* Set the flags byte */
 
         {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering),
          AML_OFFSET(irq.flags),
@@ -118,6 +126,33 @@ struct acpi_rsconvert_info acpi_rs_set_irq[9] = {
         {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
          AML_OFFSET(irq.flags),
          4},
+
+        /*
+         * All done if the output descriptor length is required to be 3
+         * (i.e., optimization to 2 bytes cannot be attempted)
+         */
+        {ACPI_RSC_EXIT_EQ, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.irq.descriptor_length),
+         3},
+
+        /* Set length to 2 bytes (no flags byte) */
+
+        {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_irq_noflags)},
+
+        /*
+         * All done if the output descriptor length is required to be 2.
+         *
+         * TBD: Perhaps we should check for error if input flags are not
+         * compatible with a 2-byte descriptor.
+         */
+        {ACPI_RSC_EXIT_EQ, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.irq.descriptor_length),
+         2},
+
+        /* Reset length to 3 bytes (descriptor with flags byte) */
+
+        {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_irq)},
+
         /*
          * Check if the flags byte is necessary. Not needed if the flags are:
          * ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_HIGH, ACPI_EXCLUSIVE
@@ -134,7 +169,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[9] = {
          ACPI_RS_OFFSET(data.irq.sharable),
          ACPI_EXCLUSIVE},
 
-        /* irq_no_flags() descriptor can be used */
+        /* We can optimize to a 2-byte irq_no_flags() descriptor */
 
         {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_irq_noflags)}
 };
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index ca21e4660c79..b78c7e797a19 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c
index 521eab7dd8df..63b21abd90bb 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/resources/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index c7081afa893a..de1ac3881b22 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -497,6 +497,17 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                         }
                         break;
 
+                case ACPI_RSC_EXIT_EQ:
+                        /*
+                         * Control - Exit conversion if equal
+                         */
+                        if (*ACPI_ADD_PTR(u8, resource,
+                                          COMPARE_TARGET(info)) ==
+                            COMPARE_VALUE(info)) {
+                                goto exit;
+                        }
+                        break;
+
                 default:
 
                         ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 11c0bd7b9cfd..befe2302f41b 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,17 +97,17 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 {
         acpi_native_uint i;
-        u16 mask;
+        acpi_native_uint mask;
 
         ACPI_FUNCTION_ENTRY();
 
         /* Encode the list into a single bitmask */
 
         for (i = 0, mask = 0; i < count; i++) {
-                mask |= (0x0001 << list[i]);
+                mask |= (0x1 << list[i]);
         }
 
-        return (mask);
+        return ((u16) mask);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 4c3fd4cdaf73..f59f4c4e034c 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index e6ce262b5d44..6d85289f1c12 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -677,9 +677,8 @@ acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
         device->wakeup.resources.count = package->package.count - 2;
         for (i = 0; i < device->wakeup.resources.count; i++) {
                 element = &(package->package.elements[i + 2]);
-                if (element->type != ACPI_TYPE_ANY) {
+                if (element->type != ACPI_TYPE_LOCAL_REFERENCE)
                         return AE_BAD_DATA;
-                }
 
                 device->wakeup.resources.handles[i] = element->reference.handle;
         }
@@ -692,6 +691,9 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         acpi_status status = 0;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *package = NULL;
+        union acpi_object in_arg[3];
+        struct acpi_object_list arg_list = { 3, in_arg };
+        acpi_status psw_status = AE_OK;
 
         struct acpi_device_id button_device_ids[] = {
                 {"PNP0C0D", 0},
@@ -700,7 +702,6 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
                 {"", 0},
         };
 
-
         /* _PRW */
         status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
@@ -718,6 +719,45 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         kfree(buffer.pointer);
 
         device->wakeup.flags.valid = 1;
+        /* Call _PSW/_DSW object to disable its ability to wake the sleeping
+         * system for the ACPI device with the _PRW object.
+         * The _PSW object is depreciated in ACPI 3.0 and is replaced by _DSW.
+         * So it is necessary to call _DSW object first. Only when it is not
+         * present will the _PSW object used.
+         */
+        /*
+         * Three agruments are needed for the _DSW object.
+         * Argument 0: enable/disable the wake capabilities
+         * When _DSW object is called to disable the wake capabilities, maybe
+         * the first argument is filled. The value of the other two agruments
+         * is meaningless.
+         */
+        in_arg[0].type = ACPI_TYPE_INTEGER;
+        in_arg[0].integer.value = 0;
+        in_arg[1].type = ACPI_TYPE_INTEGER;
+        in_arg[1].integer.value = 0;
+        in_arg[2].type = ACPI_TYPE_INTEGER;
+        in_arg[2].integer.value = 0;
+        psw_status = acpi_evaluate_object(device->handle, "_DSW",
+                                                &arg_list, NULL);
+        if (ACPI_FAILURE(psw_status) && (psw_status != AE_NOT_FOUND))
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "error in evaluate _DSW\n"));
+        /*
+         * When the _DSW object is not present, OSPM will call _PSW object.
+         */
+        if (psw_status == AE_NOT_FOUND) {
+                /*
+                 * Only one agruments is required for the _PSW object.
+                 * agrument 0: enable/disable the wake capabilities
+                 */
+                arg_list.count = 1;
+                in_arg[0].integer.value = 0;
+                psw_status = acpi_evaluate_object(device->handle, "_PSW",
+                                                &arg_list, NULL);
+                if (ACPI_FAILURE(psw_status) && (psw_status != AE_NOT_FOUND))
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "error in "
+                                                "evaluate _PSW\n"));
+        }
         /* Power button, Lid switch always enable wakeup */
         if (!acpi_match_device_ids(device, button_device_ids))
                 device->wakeup.flags.run_wake = 1;
@@ -882,10 +922,7 @@ static void acpi_device_get_busid(struct acpi_device *device,
 static int
 acpi_video_bus_match(struct acpi_device *device)
 {
-        acpi_handle h_dummy1;
-        acpi_handle h_dummy2;
-        acpi_handle h_dummy3;
-
+        acpi_handle h_dummy;
 
         if (!device)
                 return -EINVAL;
@@ -895,18 +932,18 @@ acpi_video_bus_match(struct acpi_device *device)
          */
 
         /* Does this device able to support video switching ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy1)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy2)))
+        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
                 return 0;
 
         /* Does this device able to retrieve a video ROM ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy1)))
+        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
                 return 0;
 
         /* Does this device able to configure which video head to be POSTed ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy1)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy2)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy3)))
+        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
+            ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
                 return 0;
 
         return -ENODEV;
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 71183eea7906..c3b0cd88d09f 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -51,7 +51,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
 }
 
 #ifdef CONFIG_SUSPEND
-static struct platform_suspend_ops acpi_pm_ops;
+static struct platform_suspend_ops acpi_suspend_ops;
 
 extern void do_suspend_lowlevel(void);
 
@@ -65,11 +65,11 @@ static u32 acpi_suspend_states[] = {
 static int init_8259A_after_S1;
 
 /**
- *      acpi_pm_begin - Set the target system sleep state to the state
+ *      acpi_suspend_begin - Set the target system sleep state to the state
  *              associated with given @pm_state, if supported.
  */
 
-static int acpi_pm_begin(suspend_state_t pm_state)
+static int acpi_suspend_begin(suspend_state_t pm_state)
 {
         u32 acpi_state = acpi_suspend_states[pm_state];
         int error = 0;
@@ -85,13 +85,13 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 }
 
 /**
- *      acpi_pm_prepare - Do preliminary suspend work.
+ *      acpi_suspend_prepare - Do preliminary suspend work.
  *
  *      If necessary, set the firmware waking vector and do arch-specific
  *      nastiness to get the wakeup code to the waking vector.
  */
 
-static int acpi_pm_prepare(void)
+static int acpi_suspend_prepare(void)
 {
         int error = acpi_sleep_prepare(acpi_target_sleep_state);
 
@@ -104,7 +104,7 @@ static int acpi_pm_prepare(void)
 }
 
 /**
- *      acpi_pm_enter - Actually enter a sleep state.
+ *      acpi_suspend_enter - Actually enter a sleep state.
  *      @pm_state: ignored
  *
  *      Flush caches and go to sleep. For STR we have to call arch-specific
@@ -112,7 +112,7 @@ static int acpi_pm_prepare(void)
  *      It's unfortunate, but it works. Please fix if you're feeling frisky.
  */
 
-static int acpi_pm_enter(suspend_state_t pm_state)
+static int acpi_suspend_enter(suspend_state_t pm_state)
 {
         acpi_status status = AE_OK;
         unsigned long flags = 0;
@@ -169,13 +169,13 @@ static int acpi_pm_enter(suspend_state_t pm_state)
 }
 
 /**
- *      acpi_pm_finish - Instruct the platform to leave a sleep state.
+ *      acpi_suspend_finish - Instruct the platform to leave a sleep state.
  *
  *      This is called after we wake back up (or if entering the sleep state
  *      failed). 
  */
 
-static void acpi_pm_finish(void)
+static void acpi_suspend_finish(void)
 {
         u32 acpi_state = acpi_target_sleep_state;
 
@@ -196,19 +196,19 @@ static void acpi_pm_finish(void)
 }
 
 /**
- *      acpi_pm_end - Finish up suspend sequence.
+ *      acpi_suspend_end - Finish up suspend sequence.
  */
 
-static void acpi_pm_end(void)
+static void acpi_suspend_end(void)
 {
         /*
-         * This is necessary in case acpi_pm_finish() is not called during a
+         * This is necessary in case acpi_suspend_finish() is not called during a
          * failing transition to a sleep state.
          */
         acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
-static int acpi_pm_state_valid(suspend_state_t pm_state)
+static int acpi_suspend_state_valid(suspend_state_t pm_state)
 {
         u32 acpi_state;
 
@@ -224,13 +224,13 @@ static int acpi_pm_state_valid(suspend_state_t pm_state)
         }
 }
 
-static struct platform_suspend_ops acpi_pm_ops = {
-        .valid = acpi_pm_state_valid,
-        .begin = acpi_pm_begin,
-        .prepare = acpi_pm_prepare,
-        .enter = acpi_pm_enter,
-        .finish = acpi_pm_finish,
-        .end = acpi_pm_end,
+static struct platform_suspend_ops acpi_suspend_ops = {
+        .valid = acpi_suspend_state_valid,
+        .begin = acpi_suspend_begin,
+        .prepare = acpi_suspend_prepare,
+        .enter = acpi_suspend_enter,
+        .finish = acpi_suspend_finish,
+        .end = acpi_suspend_end,
 };
 
 /*
@@ -492,7 +492,7 @@ int __init acpi_sleep_init(void)
                 }
         }
 
-        suspend_set_ops(&acpi_pm_ops);
+        suspend_set_ops(&acpi_suspend_ops);
 #endif
 
 #ifdef CONFIG_HIBERNATION
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 002bb33003af..949d4114eb9f 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/tables/tbfind.c b/drivers/acpi/tables/tbfind.c
index 058c064948e1..9ca3afc98c80 100644
--- a/drivers/acpi/tables/tbfind.c
+++ b/drivers/acpi/tables/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,12 +70,22 @@ acpi_tb_find_table(char *signature,
 {
         acpi_native_uint i;
         acpi_status status;
+        struct acpi_table_header header;
 
         ACPI_FUNCTION_TRACE(tb_find_table);
 
+        /* Normalize the input strings */
+
+        ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header));
+        ACPI_STRNCPY(header.signature, signature, ACPI_NAME_SIZE);
+        ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
+        ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
+
+        /* Search for the table */
+
         for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
                 if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature),
-                                signature, ACPI_NAME_SIZE)) {
+                                header.signature, ACPI_NAME_SIZE)) {
 
                         /* Not the requested table */
 
@@ -104,20 +114,24 @@ acpi_tb_find_table(char *signature,
 
                 if (!ACPI_MEMCMP
                     (acpi_gbl_root_table_list.tables[i].pointer->signature,
-                     signature, ACPI_NAME_SIZE) && (!oem_id[0]
-                                                    ||
-                                                    !ACPI_MEMCMP
-                                                    (acpi_gbl_root_table_list.
-                                                     tables[i].pointer->oem_id,
-                                                     oem_id, ACPI_OEM_ID_SIZE))
+                     header.signature, ACPI_NAME_SIZE) && (!oem_id[0]
+                                                           ||
+                                                           !ACPI_MEMCMP
+                                                           (acpi_gbl_root_table_list.
+                                                            tables[i].pointer->
+                                                            oem_id,
+                                                            header.oem_id,
+                                                            ACPI_OEM_ID_SIZE))
                     && (!oem_table_id[0]
                         || !ACPI_MEMCMP(acpi_gbl_root_table_list.tables[i].
-                                        pointer->oem_table_id, oem_table_id,
+                                        pointer->oem_table_id,
+                                        header.oem_table_id,
                                         ACPI_OEM_TABLE_ID_SIZE))) {
                         *table_index = i;
 
                         ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
-                                          "Found table [%4.4s]\n", signature));
+                                          "Found table [%4.4s]\n",
+                                          header.signature));
                         return_ACPI_STATUS(AE_OK);
                 }
         }
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 3bc0c67a9283..402f93e1ff20 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -125,13 +125,20 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc,
 
         /* The table must be either an SSDT or a PSDT or an OEMx */
 
-        if ((!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT))
-            &&
-            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
-            && (strncmp(table_desc->pointer->signature, "OEM", 3))) {
-                ACPI_ERROR((AE_INFO,
-                            "Table has invalid signature [%4.4s], must be SSDT, PSDT or OEMx",
-                            table_desc->pointer->signature));
+        if (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT)&&
+            !ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)&&
+            strncmp(table_desc->pointer->signature, "OEM", 3)) {
+                /* Check for a printable name */
+                if (acpi_ut_valid_acpi_name(
+                        *(u32 *) table_desc->pointer->signature)) {
+                        ACPI_ERROR((AE_INFO, "Table has invalid signature "
+                                        "[%4.4s], must be SSDT or PSDT",
+                                    table_desc->pointer->signature));
+                } else {
+                        ACPI_ERROR((AE_INFO, "Table has invalid signature "
+                                        "(0x%8.8X), must be SSDT or PSDT",
+                                    *(u32 *) table_desc->pointer->signature));
+                }
                 return_ACPI_STATUS(AE_BAD_SIGNATURE);
         }
 
@@ -162,6 +169,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc,
 
                 acpi_tb_delete_table(table_desc);
                 *table_index = i;
+                status = AE_ALREADY_EXISTS;
                 goto release;
         }
 
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 010f19652f80..bc019b9b6a68 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -212,7 +212,7 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 
         if (checksum) {
                 ACPI_WARNING((AE_INFO,
-                              "Incorrect checksum in table [%4.4s] -  %2.2X, should be %2.2X",
+                              "Incorrect checksum in table [%4.4s] - %2.2X, should be %2.2X",
                               table->signature, table->checksum,
                               (u8) (table->checksum - checksum)));
 
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index a9e3331fee5d..fb57b93c2495 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -635,6 +635,95 @@ acpi_status acpi_load_tables(void)
 ACPI_EXPORT_SYMBOL(acpi_load_tables)
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_table_handler
+ *
+ * PARAMETERS:  Handler         - Table event handler
+ *              Context         - Value passed to the handler on each event
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Install table event handler
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_table_handler(acpi_tbl_handler handler, void *context)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_install_table_handler);
+
+        if (!handler) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Don't allow more than one handler */
+
+        if (acpi_gbl_table_handler) {
+                status = AE_ALREADY_EXISTS;
+                goto cleanup;
+        }
+
+        /* Install the handler */
+
+        acpi_gbl_table_handler = handler;
+        acpi_gbl_table_handler_context = context;
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_table_handler)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_remove_table_handler
+ *
+ * PARAMETERS:  Handler         - Table event handler that was installed
+ *                                previously.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove table event handler
+ *
+ ******************************************************************************/
+acpi_status acpi_remove_table_handler(acpi_tbl_handler handler)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_remove_table_handler);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Make sure that the installed handler is the same */
+
+        if (!handler || handler != acpi_gbl_table_handler) {
+                status = AE_BAD_PARAMETER;
+                goto cleanup;
+        }
+
+        /* Remove the handler */
+
+        acpi_gbl_table_handler = NULL;
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+
+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");
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 9ecb4b6c1e7d..b8c0dfa084f6 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0815ac3ae3d6..504385b1f211 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -889,10 +889,15 @@ static void acpi_thermal_check(void *data)
 static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf)
 {
         struct acpi_thermal *tz = thermal->devdata;
+        int result;
 
         if (!tz)
                 return -EINVAL;
 
+        result = acpi_thermal_get_temperature(tz);
+        if (result)
+                return result;
+
         return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(tz->temperature));
 }
 
@@ -1017,6 +1022,18 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         return -EINVAL;
 }
 
+static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
+                                unsigned long *temperature) {
+        struct acpi_thermal *tz = thermal->devdata;
+
+        if (tz->trips.critical.flags.valid) {
+                *temperature = KELVIN_TO_MILLICELSIUS(
+                                tz->trips.critical.temperature);
+                return 0;
+        } else
+                return -EINVAL;
+}
+
 typedef int (*cb)(struct thermal_zone_device *, int,
                   struct thermal_cooling_device *);
 static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
@@ -1108,6 +1125,7 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
         .set_mode = thermal_set_mode,
         .get_trip_type = thermal_get_trip_type,
         .get_trip_temp = thermal_get_trip_temp,
+        .get_crit_temp = thermal_get_crit_temp,
 };
 
 static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
@@ -1128,7 +1146,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
 
         for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
                         tz->trips.active[i].flags.valid; i++, trips++);
-        tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
+        tz->thermal_zone = thermal_zone_device_register("acpitz",
                                         trips, tz, &acpi_thermal_zone_ops);
         if (IS_ERR(tz->thermal_zone))
                 return -ENODEV;
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 6e56d5f7c43a..ede084829a70 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -147,7 +147,7 @@ acpi_status acpi_ut_delete_caches(void)
 
         if (acpi_gbl_display_final_mem_stats) {
                 ACPI_STRCPY(buffer, "MEMORY");
-                acpi_db_display_statistics(buffer);
+                (void)acpi_db_display_statistics(buffer);
         }
 #endif
 
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 285a0f531760..245fa80cf600 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 879eaa10d3ae..655c290aca7b 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,8 @@
 
 #include <acpi/acpi.h>
 #include <acpi/amlcode.h>
+#include <acpi/acnamesp.h>
+
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utcopy")
@@ -172,22 +174,21 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
 
         case ACPI_TYPE_LOCAL_REFERENCE:
 
-                /*
-                 * This is an object reference.  Attempt to dereference it.
-                 */
+                /* This is an object reference. */
+
                 switch (internal_object->reference.opcode) {
                 case AML_INT_NAMEPATH_OP:
 
                         /* For namepath, return the object handle ("reference") */
 
                 default:
-                        /*
-                         * Use the object type of "Any" to indicate a reference
-                         * to object containing a handle to an ACPI named object.
-                         */
-                        external_object->type = ACPI_TYPE_ANY;
+
+                        /* We are referring to the namespace node */
+
                         external_object->reference.handle =
                             internal_object->reference.node;
+                        external_object->reference.actual_type =
+                            acpi_ns_get_type(internal_object->reference.node);
                         break;
                 }
                 break;
@@ -215,6 +216,11 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
                 /*
                  * There is no corresponding external object type
                  */
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported object type, cannot convert to external object: %s",
+                            acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE
+                                                  (internal_object))));
+
                 return_ACPI_STATUS(AE_SUPPORT);
         }
 
@@ -455,6 +461,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
         case ACPI_TYPE_STRING:
         case ACPI_TYPE_BUFFER:
         case ACPI_TYPE_INTEGER:
+        case ACPI_TYPE_LOCAL_REFERENCE:
 
                 internal_object = acpi_ut_create_internal_object((u8)
                                                                  external_object->
@@ -464,9 +471,18 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                 }
                 break;
 
+        case ACPI_TYPE_ANY:     /* This is the case for a NULL object */
+
+                *ret_internal_object = NULL;
+                return_ACPI_STATUS(AE_OK);
+
         default:
                 /* All other types are not supported */
 
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported object type, cannot convert to internal object: %s",
+                            acpi_ut_get_type_name(external_object->type)));
+
                 return_ACPI_STATUS(AE_SUPPORT);
         }
 
@@ -502,6 +518,10 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                             external_object->buffer.length);
 
                 internal_object->buffer.length = external_object->buffer.length;
+
+                /* Mark buffer data valid */
+
+                internal_object->buffer.flags |= AOPOBJ_DATA_VALID;
                 break;
 
         case ACPI_TYPE_INTEGER:
@@ -509,6 +529,15 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                 internal_object->integer.value = external_object->integer.value;
                 break;
 
+        case ACPI_TYPE_LOCAL_REFERENCE:
+
+                /* TBD: should validate incoming handle */
+
+                internal_object->reference.opcode = AML_INT_NAMEPATH_OP;
+                internal_object->reference.node =
+                    external_object->reference.handle;
+                break;
+
         default:
                 /* Other types can't get here */
                 break;
@@ -570,13 +599,17 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
 
                         /* Truncate package and delete it */
 
-                        package_object->package.count = i;
+                        package_object->package.count = (u32) i;
                         package_elements[i] = NULL;
                         acpi_ut_remove_reference(package_object);
                         return_ACPI_STATUS(status);
                 }
         }
 
+        /* Mark package data valid */
+
+        package_object->package.flags |= AOPOBJ_DATA_VALID;
+
         *internal_object = package_object;
         return_ACPI_STATUS(status);
 }
@@ -709,7 +742,15 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                 /*
                  * We copied the reference object, so we now must add a reference
                  * to the object pointed to by the reference
+                 *
+                 * DDBHandle reference (from Load/load_table is a special reference,
+                 * it's Reference.Object is the table index, so does not need to
+                 * increase the reference count
                  */
+                if (source_desc->reference.opcode == AML_LOAD_OP) {
+                        break;
+                }
+
                 acpi_ut_add_reference(source_desc->reference.object);
                 break;
 
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 7361204b1eef..f938f465efa4 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,9 +68,9 @@ static const char *acpi_ut_trim_function_name(const char *function_name);
 
 void acpi_ut_init_stack_ptr_trace(void)
 {
-        u32 current_sp;
+        acpi_size current_sp;
 
-        acpi_gbl_entry_stack_pointer = ACPI_PTR_DIFF(&current_sp, NULL);
+        acpi_gbl_entry_stack_pointer = &current_sp;
 }
 
 /*******************************************************************************
@@ -89,10 +89,8 @@ void acpi_ut_track_stack_ptr(void)
 {
         acpi_size current_sp;
 
-        current_sp = ACPI_PTR_DIFF(&current_sp, NULL);
-
-        if (current_sp < acpi_gbl_lowest_stack_pointer) {
-                acpi_gbl_lowest_stack_pointer = current_sp;
+        if (&current_sp < acpi_gbl_lowest_stack_pointer) {
+                acpi_gbl_lowest_stack_pointer = &current_sp;
         }
 
         if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) {
@@ -203,6 +201,7 @@ acpi_ut_debug_print(u32 requested_debug_level,
 
         va_start(args, format);
         acpi_os_vprintf(format, args);
+        va_end(args);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)
@@ -240,6 +239,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level,
 
         va_start(args, format);
         acpi_os_vprintf(format, args);
+        va_end(args);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw)
@@ -524,6 +524,11 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
         u32 temp32;
         u8 buf_char;
 
+        if (!buffer) {
+                acpi_os_printf("Null Buffer Pointer in DumpBuffer!\n");
+                return;
+        }
+
         if ((count < 4) || (count & 0x01)) {
                 display = DB_BYTE_DISPLAY;
         }
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index f777cebdc46d..1fbc35139e84 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                                   "***** Mutex %p, OS Mutex %p\n",
                                   object, object->mutex.os_mutex));
 
-                if (object->mutex.os_mutex == acpi_gbl_global_lock_mutex) {
+                if (object == acpi_gbl_global_lock_mutex) {
 
                         /* Global Lock has extra semaphore */
 
@@ -252,6 +252,17 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 }
                 break;
 
+        case ACPI_TYPE_LOCAL_BANK_FIELD:
+
+                ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
+                                  "***** Bank Field %p\n", object));
+
+                second_desc = acpi_ns_get_secondary_object(object);
+                if (second_desc) {
+                        acpi_ut_delete_object_desc(second_desc);
+                }
+                break;
+
         default:
                 break;
         }
@@ -524,10 +535,12 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
 
                 case ACPI_TYPE_LOCAL_REFERENCE:
                         /*
-                         * The target of an Index (a package, string, or buffer) must track
-                         * changes to the ref count of the index.
+                         * The target of an Index (a package, string, or buffer) or a named
+                         * reference must track changes to the ref count of the index or
+                         * target object.
                          */
-                        if (object->reference.opcode == AML_INDEX_OP) {
+                        if ((object->reference.opcode == AML_INDEX_OP) ||
+                            (object->reference.opcode == AML_INT_NAMEPATH_OP)) {
                                 next_object = object->reference.object;
                         }
                         break;
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 0042b7e78b26..05e61be267d5 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 630c9a2c5b7b..a6e71b801d2d 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -602,6 +602,48 @@ char *acpi_ut_get_mutex_name(u32 mutex_id)
 
         return (acpi_gbl_mutex_names[mutex_id]);
 }
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_notify_name
+ *
+ * PARAMETERS:  notify_value    - Value from the Notify() request
+ *
+ * RETURN:      String corresponding to the Notify Value.
+ *
+ * DESCRIPTION: Translate a Notify Value to a notify namestring.
+ *
+ ******************************************************************************/
+
+/* Names for Notify() values, used for debug output */
+
+static const char *acpi_gbl_notify_value_names[] = {
+        "Bus Check",
+        "Device Check",
+        "Device Wake",
+        "Eject Request",
+        "Device Check Light",
+        "Frequency Mismatch",
+        "Bus Mode Mismatch",
+        "Power Fault",
+        "Capabilities Check",
+        "Device PLD Check",
+        "Reserved",
+        "System Locality Update"
+};
+
+const char *acpi_ut_get_notify_name(u32 notify_value)
+{
+
+        if (notify_value <= ACPI_NOTIFY_MAX) {
+                return (acpi_gbl_notify_value_names[notify_value]);
+        } else if (notify_value <= ACPI_MAX_SYS_NOTIFY) {
+                return ("Reserved");
+        } else {                /* Greater or equal to 0x80 */
+
+                return ("**Device Specific**");
+        }
+}
 #endif
 
 /*******************************************************************************
@@ -675,12 +717,13 @@ void acpi_ut_init_globals(void)
         acpi_gbl_gpe_fadt_blocks[0] = NULL;
         acpi_gbl_gpe_fadt_blocks[1] = NULL;
 
-        /* Global notify handlers */
+        /* Global handlers */
 
         acpi_gbl_system_notify.handler = NULL;
         acpi_gbl_device_notify.handler = NULL;
         acpi_gbl_exception_handler = NULL;
         acpi_gbl_init_handler = NULL;
+        acpi_gbl_table_handler = NULL;
 
         /* Global Lock support */
 
@@ -722,7 +765,7 @@ void acpi_ut_init_globals(void)
         acpi_gbl_root_node_struct.flags = ANOBJ_END_OF_PEER_LIST;
 
 #ifdef ACPI_DEBUG_OUTPUT
-        acpi_gbl_lowest_stack_pointer = ACPI_SIZE_MAX;
+        acpi_gbl_lowest_stack_pointer = ACPI_CAST_PTR(acpi_size, ACPI_SIZE_MAX);
 #endif
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index ad3c0d0a5cf8..cae515fc02d3 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -125,9 +125,12 @@ void acpi_ut_subsystem_shutdown(void)
         acpi_gbl_startup_flags = 0;
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
 
+#ifndef ACPI_ASL_COMPILER
+
         /* Close the acpi_event Handling */
 
         acpi_ev_terminate();
+#endif
 
         /* Close the Namespace */
 
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 0c56a0d20b29..c927324fdd26 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -276,7 +276,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,
                 *out_quotient = in_dividend / divisor;
         }
         if (out_remainder) {
-                *out_remainder = (u32) in_dividend % divisor;
+                *out_remainder = (u32) (in_dividend % divisor);
         }
 
         return_ACPI_STATUS(AE_OK);
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 2d19f71e9cfa..e4ba7192cd15 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1033,6 +1033,7 @@ acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
         va_start(args, format);
         acpi_os_vprintf(format, args);
         acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+        va_end(args);
 }
 
 void ACPI_INTERNAL_VAR_XFACE
@@ -1061,6 +1062,8 @@ acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
         va_start(args, format);
         acpi_os_vprintf(format, args);
         acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+        va_end(args);
+        va_end(args);
 }
 
 void ACPI_INTERNAL_VAR_XFACE
@@ -1077,4 +1080,5 @@ acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
         va_start(args, format);
         acpi_os_vprintf(format, args);
         acpi_os_printf("\n");
+        va_end(args);
 }
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index 4820bc86d1f5..f7d602b1a894 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index e08b3fa6639f..e68466de8044 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,6 +107,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,
         switch (type) {
         case ACPI_TYPE_REGION:
         case ACPI_TYPE_BUFFER_FIELD:
+        case ACPI_TYPE_LOCAL_BANK_FIELD:
 
                 /* These types require a secondary object */
 
@@ -469,9 +470,8 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
         case ACPI_TYPE_PROCESSOR:
         case ACPI_TYPE_POWER:
 
-                /*
-                 * No extra data for these types
-                 */
+                /* No extra data for these types */
+
                 break;
 
         case ACPI_TYPE_LOCAL_REFERENCE:
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index b630ee137ee1..c3e3e1308edc 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index edcaafad0a31..63a6d3d77d88 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index 2d496918b3cd..f8bdadf3c32f 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxface")
 
+#ifndef ACPI_ASL_COMPILER
 /*******************************************************************************
  *
  * FUNCTION:    acpi_initialize_subsystem
@@ -192,24 +193,6 @@ acpi_status acpi_enable_subsystem(u32 flags)
                 }
         }
 
-        /*
-         * Complete the GPE initialization for the GPE blocks defined in the FADT
-         * (GPE block 0 and 1).
-         *
-         * Note1: This is where the _PRW methods are executed for the GPEs. These
-         * methods can only be executed after the SCI and Global Lock handlers are
-         * installed and initialized.
-         *
-         * Note2: Currently, there seems to be no need to run the _REG methods
-         * before execution of the _PRW methods and enabling of the GPEs.
-         */
-        if (!(flags & ACPI_NO_EVENT_INIT)) {
-                status = acpi_ev_install_fadt_gpes();
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-        }
-
         return_ACPI_STATUS(status);
 }
 
@@ -280,6 +263,23 @@ acpi_status acpi_initialize_objects(u32 flags)
         }
 
         /*
+         * Complete the GPE initialization for the GPE blocks defined in the FADT
+         * (GPE block 0 and 1).
+         *
+         * Note1: This is where the _PRW methods are executed for the GPEs. These
+         * methods can only be executed after the SCI and Global Lock handlers are
+         * installed and initialized.
+         *
+         * Note2: Currently, there seems to be no need to run the _REG methods
+         * before execution of the _PRW methods and enabling of the GPEs.
+         */
+        if (!(flags & ACPI_NO_EVENT_INIT)) {
+                status = acpi_ev_install_fadt_gpes();
+                if (ACPI_FAILURE(status))
+                        return (status);
+        }
+
+        /*
          * Empty the caches (delete the cached objects) on the assumption that
          * the table load filled them up more than they will be at runtime --
          * thus wasting non-paged memory.
@@ -292,6 +292,7 @@ acpi_status acpi_initialize_objects(u32 flags)
 
 ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
 
+#endif
 /*******************************************************************************
  *
  * FUNCTION:    acpi_terminate
@@ -335,6 +336,7 @@ acpi_status acpi_terminate(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_terminate)
+#ifndef ACPI_ASL_COMPILER
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -490,3 +492,4 @@ acpi_status acpi_purge_cached_objects(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_purge_cached_objects)
+#endif
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 44ea60cf21c0..100926143818 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -398,7 +398,7 @@ acpi_evaluate_reference(acpi_handle handle,
 
                 element = &(package->package.elements[i]);
 
-                if (element->type != ACPI_TYPE_ANY) {
+                if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
                         status = AE_BAD_DATA;
                         printk(KERN_ERR PREFIX
                                     "Expecting a [Reference] package element, found type %X\n",
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 43b228314a86..f7eb12e55602 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -57,8 +57,6 @@
 #define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS       0x88
 #define ACPI_VIDEO_NOTIFY_DISPLAY_OFF           0x89
 
-#define ACPI_VIDEO_HEAD_INVALID         (~0u - 1)
-#define ACPI_VIDEO_HEAD_END             (~0u)
 #define MAX_NAME_LEN    20
 
 #define ACPI_VIDEO_DISPLAY_CRT  1
@@ -743,21 +741,19 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 if (IS_ERR(device->cdev))
                         return;
 
-                if (device->cdev) {
-                        printk(KERN_INFO PREFIX
-                                "%s is registered as cooling_device%d\n",
-                                device->dev->dev.bus_id, device->cdev->id);
-                        result = sysfs_create_link(&device->dev->dev.kobj,
-                                          &device->cdev->device.kobj,
-                                          "thermal_cooling");
-                        if (result)
-                                printk(KERN_ERR PREFIX "Create sysfs link\n");
-                        result = sysfs_create_link(&device->cdev->device.kobj,
-                                          &device->dev->dev.kobj,
-                                          "device");
-                        if (result)
-                                printk(KERN_ERR PREFIX "Create sysfs link\n");
-                }
+                printk(KERN_INFO PREFIX
+                        "%s is registered as cooling_device%d\n",
+                        device->dev->dev.bus_id, device->cdev->id);
+                result = sysfs_create_link(&device->dev->dev.kobj,
+                                &device->cdev->device.kobj,
+                                "thermal_cooling");
+                if (result)
+                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+                result = sysfs_create_link(&device->cdev->device.kobj,
+                                &device->dev->dev.kobj, "device");
+                if (result)
+                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+
         }
         if (device->cap._DCS && device->cap._DSS){
                 static int count = 0;
@@ -1059,30 +1055,25 @@ acpi_video_device_EDID_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_video_device_add_fs(struct acpi_device *device)
 {
-        struct proc_dir_entry *entry = NULL;
+        struct proc_dir_entry *entry, *device_dir;
         struct acpi_video_device *vid_dev;
 
-
-        if (!device)
-                return -ENODEV;
-
         vid_dev = acpi_driver_data(device);
         if (!vid_dev)
                 return -ENODEV;
 
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     vid_dev->video->dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
-        }
+        device_dir = proc_mkdir(acpi_device_bid(device),
+                                vid_dev->video->dir);
+        if (!device_dir)
+                return -ENOMEM;
+
+        device_dir->owner = THIS_MODULE;
 
         /* 'info' [R] */
         entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
                         &acpi_video_device_info_fops, acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_dir;
 
         /* 'state' [R/W] */
         acpi_video_device_state_fops.write = acpi_video_device_write_state;
@@ -1091,7 +1082,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
                                  &acpi_video_device_state_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_info;
 
         /* 'brightness' [R/W] */
         acpi_video_device_brightness_fops.write =
@@ -1101,30 +1092,43 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
                                  &acpi_video_device_brightness_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_state;
 
         /* 'EDID' [R] */
         entry = proc_create_data("EDID", S_IRUGO, acpi_device_dir(device),
                                  &acpi_video_device_EDID_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_brightness;
+
         return 0;
+
+ err_remove_brightness:
+        remove_proc_entry("brightness", device_dir);
+ err_remove_state:
+        remove_proc_entry("state", device_dir);
+ err_remove_info:
+        remove_proc_entry("info", device_dir);
+ err_remove_dir:
+        remove_proc_entry(acpi_device_bid(device), vid_dev->video->dir);
+        return -ENOMEM;
 }
 
 static int acpi_video_device_remove_fs(struct acpi_device *device)
 {
         struct acpi_video_device *vid_dev;
+        struct proc_dir_entry *device_dir;
 
         vid_dev = acpi_driver_data(device);
         if (!vid_dev || !vid_dev->video || !vid_dev->video->dir)
                 return -ENODEV;
 
-        if (acpi_device_dir(device)) {
-                remove_proc_entry("info", acpi_device_dir(device));
-                remove_proc_entry("state", acpi_device_dir(device));
-                remove_proc_entry("brightness", acpi_device_dir(device));
-                remove_proc_entry("EDID", acpi_device_dir(device));
+        device_dir = acpi_device_dir(device);
+        if (device_dir) {
+                remove_proc_entry("info", device_dir);
+                remove_proc_entry("state", device_dir);
+                remove_proc_entry("brightness", device_dir);
+                remove_proc_entry("EDID", device_dir);
                 remove_proc_entry(acpi_device_bid(device), vid_dev->video->dir);
                 acpi_device_dir(device) = NULL;
         }
@@ -1331,76 +1335,81 @@ acpi_video_bus_write_DOS(struct file *file,
 
 static int acpi_video_bus_add_fs(struct acpi_device *device)
 {
-        struct proc_dir_entry *entry = NULL;
-        struct acpi_video_bus *video;
+        struct acpi_video_bus *video = acpi_driver_data(device);
+        struct proc_dir_entry *device_dir;
+        struct proc_dir_entry *entry;
 
+        device_dir = proc_mkdir(acpi_device_bid(device), acpi_video_dir);
+        if (!device_dir)
+                return -ENOMEM;
 
-        video = acpi_driver_data(device);
-
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_video_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-                video->dir = acpi_device_dir(device);
-                acpi_device_dir(device)->owner = THIS_MODULE;
-        }
+        device_dir->owner = THIS_MODULE;
 
         /* 'info' [R] */
         entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
                                  &acpi_video_bus_info_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_dir;
 
         /* 'ROM' [R] */
         entry = proc_create_data("ROM", S_IRUGO, acpi_device_dir(device),
                                  &acpi_video_bus_ROM_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_info;
 
         /* 'POST_info' [R] */
         entry = proc_create_data("POST_info", S_IRUGO, acpi_device_dir(device),
                                  &acpi_video_bus_POST_info_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_rom;
 
         /* 'POST' [R/W] */
         acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
-        entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IRUSR,
+        entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IWUSR,
                                  acpi_device_dir(device),
                                  &acpi_video_bus_POST_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_post_info;
 
         /* 'DOS' [R/W] */
         acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
-        entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IRUSR,
+        entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IWUSR,
                                  acpi_device_dir(device),
                                  &acpi_video_bus_DOS_fops,
                                  acpi_driver_data(device));
         if (!entry)
-                return -ENODEV;
+                goto err_remove_post;
 
+        video->dir = acpi_device_dir(device) = device_dir;
         return 0;
+
+ err_remove_post:
+        remove_proc_entry("POST", device_dir);
+ err_remove_post_info:
+        remove_proc_entry("POST_info", device_dir);
+ err_remove_rom:
+        remove_proc_entry("ROM", device_dir);
+ err_remove_info:
+        remove_proc_entry("info", device_dir);
+ err_remove_dir:
+        remove_proc_entry(acpi_device_bid(device), acpi_video_dir);
+        return -ENOMEM;
 }
 
 static int acpi_video_bus_remove_fs(struct acpi_device *device)
 {
-        struct acpi_video_bus *video;
-
+        struct proc_dir_entry *device_dir = acpi_device_dir(device);
 
-        video = acpi_driver_data(device);
-
-        if (acpi_device_dir(device)) {
-                remove_proc_entry("info", acpi_device_dir(device));
-                remove_proc_entry("ROM", acpi_device_dir(device));
-                remove_proc_entry("POST_info", acpi_device_dir(device));
-                remove_proc_entry("POST", acpi_device_dir(device));
-                remove_proc_entry("DOS", acpi_device_dir(device));
+        if (device_dir) {
+                remove_proc_entry("info", device_dir);
+                remove_proc_entry("ROM", device_dir);
+                remove_proc_entry("POST_info", device_dir);
+                remove_proc_entry("POST", device_dir);
+                remove_proc_entry("DOS", device_dir);
                 remove_proc_entry(acpi_device_bid(device), acpi_video_dir);
                 acpi_device_dir(device) = NULL;
         }
@@ -1416,11 +1425,15 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
 static struct acpi_video_device_attrib*
 acpi_video_get_device_attr(struct acpi_video_bus *video, unsigned long device_id)
 {
-        int count;
+        struct acpi_video_enumerated_device *ids;
+        int i;
+
+        for (i = 0; i < video->attached_count; i++) {
+                ids = &video->attached_array[i];
+                if ((ids->value.int_val & 0xffff) == device_id)
+                        return &ids->value.attrib;
+        }
 
-        for(count = 0; count < video->attached_count; count++)
-                if((video->attached_array[count].value.int_val & 0xffff) == device_id)
-                        return &(video->attached_array[count].value.attrib);
         return NULL;
 }
 
@@ -1547,20 +1560,16 @@ static void
 acpi_video_device_bind(struct acpi_video_bus *video,
                        struct acpi_video_device *device)
 {
+        struct acpi_video_enumerated_device *ids;
         int i;
 
-#define IDS_VAL(i) video->attached_array[i].value.int_val
-#define IDS_BIND(i) video->attached_array[i].bind_info
-
-        for (i = 0; IDS_VAL(i) != ACPI_VIDEO_HEAD_INVALID &&
-             i < video->attached_count; i++) {
-                if (device->device_id == (IDS_VAL(i) & 0xffff)) {
-                        IDS_BIND(i) = device;
+        for (i = 0; i < video->attached_count; i++) {
+                ids = &video->attached_array[i];
+                if (device->device_id == (ids->value.int_val & 0xffff)) {
+                        ids->bind_info = device;
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "device_bind %d\n", i));
                 }
         }
-#undef IDS_VAL
-#undef IDS_BIND
 }
 
 /*
@@ -1579,7 +1588,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
         int status;
         int count;
         int i;
-        struct acpi_video_enumerated_device *active_device_list;
+        struct acpi_video_enumerated_device *active_list;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *dod = NULL;
         union acpi_object *obj;
@@ -1600,13 +1609,10 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d video heads in _DOD\n",
                           dod->package.count));
 
-        active_device_list = kmalloc((1 +
-                                      dod->package.count) *
-                                     sizeof(struct
-                                            acpi_video_enumerated_device),
-                                     GFP_KERNEL);
-
-        if (!active_device_list) {
+        active_list = kcalloc(1 + dod->package.count,
+                              sizeof(struct acpi_video_enumerated_device),
+                              GFP_KERNEL);
+        if (!active_list) {
                 status = -ENOMEM;
                 goto out;
         }
@@ -1616,23 +1622,24 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
                 obj = &dod->package.elements[i];
 
                 if (obj->type != ACPI_TYPE_INTEGER) {
-                        printk(KERN_ERR PREFIX "Invalid _DOD data\n");
-                        active_device_list[i].value.int_val =
-                            ACPI_VIDEO_HEAD_INVALID;
+                        printk(KERN_ERR PREFIX
+                                "Invalid _DOD data in element %d\n", i);
+                        continue;
                 }
-                active_device_list[i].value.int_val = obj->integer.value;
-                active_device_list[i].bind_info = NULL;
+
+                active_list[count].value.int_val = obj->integer.value;
+                active_list[count].bind_info = NULL;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "dod element[%d] = %d\n", i,
                                   (int)obj->integer.value));
                 count++;
         }
-        active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END;
 
         kfree(video->attached_array);
 
-        video->attached_array = active_device_list;
+        video->attached_array = active_list;
         video->attached_count = count;
-      out:
+
+ out:
         kfree(buffer.pointer);
         return status;
 }
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 297a48f85446..636af2862308 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -140,6 +140,7 @@ config ACER_WMI
         depends on EXPERIMENTAL
         depends on ACPI
         depends on LEDS_CLASS
+        depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
         depends on SERIO_I8042
         select ACPI_WMI
@@ -160,6 +161,7 @@ config ASUS_LAPTOP
         depends on ACPI
         depends on EXPERIMENTAL && !ACPI_ASUS
         depends on LEDS_CLASS
+        depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
         ---help---
           This is the new Linux driver for Asus laptops. It may also support some
@@ -241,10 +243,13 @@ config SONYPI_COMPAT
 config THINKPAD_ACPI
         tristate "ThinkPad ACPI Laptop Extras"
         depends on X86 && ACPI
+        select BACKLIGHT_LCD_SUPPORT
         select BACKLIGHT_CLASS_DEVICE
         select HWMON
         select NVRAM
-        depends on INPUT
+        select INPUT
+        select NEW_LEDS
+        select LEDS_CLASS
         ---help---
           This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
           support for Fn-Fx key combinations, Bluetooth control, video
@@ -344,6 +349,7 @@ config ATMEL_SSC
 config INTEL_MENLOW
         tristate "Thermal Management driver for Intel menlow platform"
         depends on ACPI_THERMAL
+        select THERMAL
         depends on X86
         ---help---
           ACPI thermal management enhancement driver on
@@ -351,6 +357,19 @@ config INTEL_MENLOW
 
           If unsure, say N.
 
+config EEEPC_LAPTOP
+        tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
+        depends on X86
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        depends on HWMON
+        depends on EXPERIMENTAL
+        ---help---
+          This driver supports the Fn-Fx keys on Eee PC laptops.
+          It also adds the ability to switch camera/wlan on/off.
+
+          If you have an Eee PC laptop, say Y or M here.
+
 config ENCLOSURE_SERVICES
         tristate "Enclosure Services"
         default n
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 5914da434854..1952875a272e 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -7,7 +7,8 @@ obj-$(CONFIG_IBM_ASM)		+= ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
 obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 obj-$(CONFIG_ACER_WMI)     += acer-wmi.o
-obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
+obj-$(CONFIG_ASUS_LAPTOP)       += asus-laptop.o
+obj-$(CONFIG_EEEPC_LAPTOP)      += eeepc-laptop.o
 obj-$(CONFIG_ATMEL_PWM)         += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)         += atmel-ssc.o
 obj-$(CONFIG_ATMEL_TCLIB)       += atmel_tclib.o
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
new file mode 100644
index 000000000000..6d727609097f
--- /dev/null
+++ b/drivers/misc/eeepc-laptop.c
@@ -0,0 +1,666 @@
+/*
+ *  eepc-laptop.c - Asus Eee PC extras
+ *
+ *  Based on asus_acpi.c as patched for the Eee PC by Asus:
+ *  ftp://ftp.asus.com/pub/ASUS/EeePC/701/ASUS_ACPI_071126.rar
+ *  Based on eee.c from eeepc-linux
+ *
+ *  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/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
+#include <linux/uaccess.h>
+
+#define EEEPC_LAPTOP_VERSION    "0.1"
+
+#define EEEPC_HOTK_NAME         "Eee PC Hotkey Driver"
+#define EEEPC_HOTK_FILE         "eeepc"
+#define EEEPC_HOTK_CLASS        "hotkey"
+#define EEEPC_HOTK_DEVICE_NAME  "Hotkey"
+#define EEEPC_HOTK_HID          "ASUS010"
+
+#define EEEPC_LOG       EEEPC_HOTK_FILE ": "
+#define EEEPC_ERR       KERN_ERR        EEEPC_LOG
+#define EEEPC_WARNING   KERN_WARNING    EEEPC_LOG
+#define EEEPC_NOTICE    KERN_NOTICE     EEEPC_LOG
+#define EEEPC_INFO      KERN_INFO       EEEPC_LOG
+
+/*
+ * Definitions for Asus EeePC
+ */
+#define NOTIFY_WLAN_ON  0x10
+#define NOTIFY_BRN_MIN  0x20
+#define NOTIFY_BRN_MAX  0x2f
+
+enum {
+        DISABLE_ASL_WLAN = 0x0001,
+        DISABLE_ASL_BLUETOOTH = 0x0002,
+        DISABLE_ASL_IRDA = 0x0004,
+        DISABLE_ASL_CAMERA = 0x0008,
+        DISABLE_ASL_TV = 0x0010,
+        DISABLE_ASL_GPS = 0x0020,
+        DISABLE_ASL_DISPLAYSWITCH = 0x0040,
+        DISABLE_ASL_MODEM = 0x0080,
+        DISABLE_ASL_CARDREADER = 0x0100
+};
+
+enum {
+        CM_ASL_WLAN = 0,
+        CM_ASL_BLUETOOTH,
+        CM_ASL_IRDA,
+        CM_ASL_1394,
+        CM_ASL_CAMERA,
+        CM_ASL_TV,
+        CM_ASL_GPS,
+        CM_ASL_DVDROM,
+        CM_ASL_DISPLAYSWITCH,
+        CM_ASL_PANELBRIGHT,
+        CM_ASL_BIOSFLASH,
+        CM_ASL_ACPIFLASH,
+        CM_ASL_CPUFV,
+        CM_ASL_CPUTEMPERATURE,
+        CM_ASL_FANCPU,
+        CM_ASL_FANCHASSIS,
+        CM_ASL_USBPORT1,
+        CM_ASL_USBPORT2,
+        CM_ASL_USBPORT3,
+        CM_ASL_MODEM,
+        CM_ASL_CARDREADER,
+        CM_ASL_LID
+};
+
+const char *cm_getv[] = {
+        "WLDG", NULL, NULL, NULL,
+        "CAMG", NULL, NULL, NULL,
+        NULL, "PBLG", NULL, NULL,
+        "CFVG", NULL, NULL, NULL,
+        "USBG", NULL, NULL, "MODG",
+        "CRDG", "LIDG"
+};
+
+const char *cm_setv[] = {
+        "WLDS", NULL, NULL, NULL,
+        "CAMS", NULL, NULL, NULL,
+        "SDSP", "PBLS", "HDPS", NULL,
+        "CFVS", NULL, NULL, NULL,
+        "USBG", NULL, NULL, "MODS",
+        "CRDS", NULL
+};
+
+#define EEEPC_EC        "\\_SB.PCI0.SBRG.EC0."
+
+#define EEEPC_EC_FAN_PWM        EEEPC_EC "SC02" /* Fan PWM duty cycle (%) */
+#define EEEPC_EC_SC02           0x63
+#define EEEPC_EC_FAN_HRPM       EEEPC_EC "SC05" /* High byte, fan speed (RPM) */
+#define EEEPC_EC_FAN_LRPM       EEEPC_EC "SC06" /* Low byte, fan speed (RPM) */
+#define EEEPC_EC_FAN_CTRL       EEEPC_EC "SFB3" /* Byte containing SF25  */
+#define EEEPC_EC_SFB3           0xD3
+
+/*
+ * This is the main structure, we can use it to store useful information
+ * about the hotk device
+ */
+struct eeepc_hotk {
+        struct acpi_device *device;     /* the device we are in */
+        acpi_handle handle;             /* the handle of the hotk device */
+        u32 cm_supported;               /* the control methods supported
+                                           by this BIOS */
+        uint init_flag;                 /* Init flags */
+        u16 event_count[128];           /* count for each event */
+};
+
+/* The actual device the driver binds to */
+static struct eeepc_hotk *ehotk;
+
+/* Platform device/driver */
+static struct platform_driver platform_driver = {
+        .driver = {
+                .name = EEEPC_HOTK_FILE,
+                .owner = THIS_MODULE,
+        }
+};
+
+static struct platform_device *platform_device;
+
+/*
+ * The hotkey driver declaration
+ */
+static int eeepc_hotk_add(struct acpi_device *device);
+static int eeepc_hotk_remove(struct acpi_device *device, int type);
+
+static const struct acpi_device_id eeepc_device_ids[] = {
+        {EEEPC_HOTK_HID, 0},
+        {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, eeepc_device_ids);
+
+static struct acpi_driver eeepc_hotk_driver = {
+        .name = EEEPC_HOTK_NAME,
+        .class = EEEPC_HOTK_CLASS,
+        .ids = eeepc_device_ids,
+        .ops = {
+                .add = eeepc_hotk_add,
+                .remove = eeepc_hotk_remove,
+        },
+};
+
+/* The backlight device /sys/class/backlight */
+static struct backlight_device *eeepc_backlight_device;
+
+/* The hwmon device */
+static struct device *eeepc_hwmon_device;
+
+/*
+ * The backlight class declaration
+ */
+static int read_brightness(struct backlight_device *bd);
+static int update_bl_status(struct backlight_device *bd);
+static struct backlight_ops eeepcbl_ops = {
+        .get_brightness = read_brightness,
+        .update_status = update_bl_status,
+};
+
+MODULE_AUTHOR("Corentin Chary, Eric Cooper");
+MODULE_DESCRIPTION(EEEPC_HOTK_NAME);
+MODULE_LICENSE("GPL");
+
+/*
+ * ACPI Helpers
+ */
+static int write_acpi_int(acpi_handle handle, const char *method, int val,
+                          struct acpi_buffer *output)
+{
+        struct acpi_object_list params;
+        union acpi_object in_obj;
+        acpi_status status;
+
+        params.count = 1;
+        params.pointer = &in_obj;
+        in_obj.type = ACPI_TYPE_INTEGER;
+        in_obj.integer.value = val;
+
+        status = acpi_evaluate_object(handle, (char *)method, &params, output);
+        return (status == AE_OK ? 0 : -1);
+}
+
+static int read_acpi_int(acpi_handle handle, const char *method, int *val)
+{
+        acpi_status status;
+        ulong result;
+
+        status = acpi_evaluate_integer(handle, (char *)method, NULL, &result);
+        if (ACPI_FAILURE(status)) {
+                *val = -1;
+                return -1;
+        } else {
+                *val = result;
+                return 0;
+        }
+}
+
+static int set_acpi(int cm, int value)
+{
+        if (ehotk->cm_supported & (0x1 << cm)) {
+                const char *method = cm_setv[cm];
+                if (method == NULL)
+                        return -ENODEV;
+                if (write_acpi_int(ehotk->handle, method, value, NULL))
+                        printk(EEEPC_WARNING "Error writing %s\n", method);
+        }
+        return 0;
+}
+
+static int get_acpi(int cm)
+{
+        int value = -1;
+        if ((ehotk->cm_supported & (0x1 << cm))) {
+                const char *method = cm_getv[cm];
+                if (method == NULL)
+                        return -ENODEV;
+                if (read_acpi_int(ehotk->handle, method, &value))
+                        printk(EEEPC_WARNING "Error reading %s\n", method);
+        }
+        return value;
+}
+
+/*
+ * Backlight
+ */
+static int read_brightness(struct backlight_device *bd)
+{
+        return get_acpi(CM_ASL_PANELBRIGHT);
+}
+
+static int set_brightness(struct backlight_device *bd, int value)
+{
+        value = max(0, min(15, value));
+        return set_acpi(CM_ASL_PANELBRIGHT, value);
+}
+
+static int update_bl_status(struct backlight_device *bd)
+{
+        return set_brightness(bd, bd->props.brightness);
+}
+
+/*
+ * Sys helpers
+ */
+static int parse_arg(const char *buf, unsigned long count, int *val)
+{
+        if (!count)
+                return 0;
+        if (sscanf(buf, "%i", val) != 1)
+                return -EINVAL;
+        return count;
+}
+
+static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
+{
+        int rv, value;
+
+        rv = parse_arg(buf, count, &value);
+        if (rv > 0)
+                set_acpi(cm, value);
+        return rv;
+}
+
+static ssize_t show_sys_acpi(int cm, char *buf)
+{
+        return sprintf(buf, "%d\n", get_acpi(cm));
+}
+
+#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm)                            \
+        static ssize_t show_##_name(struct device *dev,                 \
+                                    struct device_attribute *attr,      \
+                                    char *buf)                          \
+        {                                                               \
+                return show_sys_acpi(_cm, buf);                         \
+        }                                                               \
+        static ssize_t store_##_name(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     const char *buf, size_t count)     \
+        {                                                               \
+                return store_sys_acpi(_cm, buf, count);                 \
+        }                                                               \
+        static struct device_attribute dev_attr_##_name = {             \
+                .attr = {                                               \
+                        .name = __stringify(_name),                     \
+                        .mode = 0644 },                                 \
+                .show   = show_##_name,                                 \
+                .store  = store_##_name,                                \
+        }
+
+EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA);
+EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER);
+EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH);
+EEEPC_CREATE_DEVICE_ATTR(wlan, CM_ASL_WLAN);
+
+static struct attribute *platform_attributes[] = {
+        &dev_attr_camera.attr,
+        &dev_attr_cardr.attr,
+        &dev_attr_disp.attr,
+        &dev_attr_wlan.attr,
+        NULL
+};
+
+static struct attribute_group platform_attribute_group = {
+        .attrs = platform_attributes
+};
+
+/*
+ * Hotkey functions
+ */
+static int eeepc_hotk_check(void)
+{
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        int result;
+
+        result = acpi_bus_get_status(ehotk->device);
+        if (result)
+                return result;
+        if (ehotk->device->status.present) {
+                if (write_acpi_int(ehotk->handle, "INIT", ehotk->init_flag,
+                                    &buffer)) {
+                        printk(EEEPC_ERR "Hotkey initialization failed\n");
+                        return -ENODEV;
+                } else {
+                        printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
+                               ehotk->init_flag);
+                }
+                /* get control methods supported */
+                if (read_acpi_int(ehotk->handle, "CMSG"
+                                   , &ehotk->cm_supported)) {
+                        printk(EEEPC_ERR
+                               "Get control methods supported failed\n");
+                        return -ENODEV;
+                } else {
+                        printk(EEEPC_INFO
+                               "Get control methods supported: 0x%x\n",
+                               ehotk->cm_supported);
+                }
+        } else {
+                printk(EEEPC_ERR "Hotkey device not present, aborting\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static void notify_wlan(u32 *event)
+{
+        /* if DISABLE_ASL_WLAN is set, the notify code for fn+f2
+           will always be 0x10 */
+        if (ehotk->cm_supported & (0x1 << CM_ASL_WLAN)) {
+                const char *method = cm_getv[CM_ASL_WLAN];
+                int value;
+                if (read_acpi_int(ehotk->handle, method, &value))
+                        printk(EEEPC_WARNING "Error reading %s\n",
+                               method);
+                else if (value == 1)
+                        *event = 0x11;
+        }
+}
+
+static void notify_brn(void)
+{
+        struct backlight_device *bd = eeepc_backlight_device;
+        bd->props.brightness = read_brightness(bd);
+}
+
+static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
+{
+        if (!ehotk)
+                return;
+        if (event == NOTIFY_WLAN_ON && (DISABLE_ASL_WLAN & ehotk->init_flag))
+                notify_wlan(&event);
+        if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
+                notify_brn();
+        acpi_bus_generate_proc_event(ehotk->device, event,
+                                     ehotk->event_count[event % 128]++);
+}
+
+static int eeepc_hotk_add(struct acpi_device *device)
+{
+        acpi_status status = AE_OK;
+        int result;
+
+        if (!device)
+                 return -EINVAL;
+        printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
+        ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
+        if (!ehotk)
+                return -ENOMEM;
+        ehotk->init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH;
+        ehotk->handle = device->handle;
+        strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
+        strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
+        acpi_driver_data(device) = ehotk;
+        ehotk->device = device;
+        result = eeepc_hotk_check();
+        if (result)
+                goto end;
+        status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
+                                             eeepc_hotk_notify, ehotk);
+        if (ACPI_FAILURE(status))
+                printk(EEEPC_ERR "Error installing notify handler\n");
+ end:
+        if (result) {
+                kfree(ehotk);
+                ehotk = NULL;
+        }
+        return result;
+}
+
+static int eeepc_hotk_remove(struct acpi_device *device, int type)
+{
+        acpi_status status = 0;
+
+        if (!device || !acpi_driver_data(device))
+                 return -EINVAL;
+        status = acpi_remove_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
+                                            eeepc_hotk_notify);
+        if (ACPI_FAILURE(status))
+                printk(EEEPC_ERR "Error removing notify handler\n");
+        kfree(ehotk);
+        return 0;
+}
+
+/*
+ * Hwmon
+ */
+static int eeepc_get_fan_pwm(void)
+{
+        int value = 0;
+
+        read_acpi_int(NULL, EEEPC_EC_FAN_PWM, &value);
+        return (value);
+}
+
+static void eeepc_set_fan_pwm(int value)
+{
+        value = SENSORS_LIMIT(value, 0, 100);
+        ec_write(EEEPC_EC_SC02, value);
+}
+
+static int eeepc_get_fan_rpm(void)
+{
+        int high = 0;
+        int low = 0;
+
+        read_acpi_int(NULL, EEEPC_EC_FAN_HRPM, &high);
+        read_acpi_int(NULL, EEEPC_EC_FAN_LRPM, &low);
+        return (high << 8 | low);
+}
+
+static int eeepc_get_fan_ctrl(void)
+{
+        int value = 0;
+
+        read_acpi_int(NULL, EEEPC_EC_FAN_CTRL, &value);
+        return ((value & 0x02 ? 1 : 0));
+}
+
+static void eeepc_set_fan_ctrl(int manual)
+{
+        int value = 0;
+
+        read_acpi_int(NULL, EEEPC_EC_FAN_CTRL, &value);
+        if (manual)
+                value |= 0x02;
+        else
+                value &= ~0x02;
+        ec_write(EEEPC_EC_SFB3, value);
+}
+
+static ssize_t store_sys_hwmon(void (*set)(int), const char *buf, size_t count)
+{
+        int rv, value;
+
+        rv = parse_arg(buf, count, &value);
+        if (rv > 0)
+                set(value);
+        return rv;
+}
+
+static ssize_t show_sys_hwmon(int (*get)(void), char *buf)
+{
+        return sprintf(buf, "%d\n", get());
+}
+
+#define EEEPC_CREATE_SENSOR_ATTR(_name, _mode, _set, _get)              \
+        static ssize_t show_##_name(struct device *dev,                 \
+                                    struct device_attribute *attr,      \
+                                    char *buf)                          \
+        {                                                               \
+                return show_sys_hwmon(_set, buf);                       \
+        }                                                               \
+        static ssize_t store_##_name(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     const char *buf, size_t count)     \
+        {                                                               \
+                return store_sys_hwmon(_get, buf, count);               \
+        }                                                               \
+        static SENSOR_DEVICE_ATTR(_name, _mode, show_##_name, store_##_name, 0);
+
+EEEPC_CREATE_SENSOR_ATTR(fan1_input, S_IRUGO, eeepc_get_fan_rpm, NULL);
+EEEPC_CREATE_SENSOR_ATTR(fan1_pwm, S_IRUGO | S_IWUSR,
+                         eeepc_get_fan_pwm, eeepc_set_fan_pwm);
+EEEPC_CREATE_SENSOR_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
+                         eeepc_get_fan_ctrl, eeepc_set_fan_ctrl);
+
+static struct attribute *hwmon_attributes[] = {
+        &sensor_dev_attr_fan1_pwm.dev_attr.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        NULL
+};
+
+static struct attribute_group hwmon_attribute_group = {
+        .attrs = hwmon_attributes
+};
+
+/*
+ * exit/init
+ */
+static void eeepc_backlight_exit(void)
+{
+        if (eeepc_backlight_device)
+                backlight_device_unregister(eeepc_backlight_device);
+        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_hwmon_exit(void)
+{
+        struct device *hwmon;
+
+        hwmon = eeepc_hwmon_device;
+        if (!hwmon)
+                return ;
+        hwmon_device_unregister(hwmon);
+        sysfs_remove_group(&hwmon->kobj,
+                           &hwmon_attribute_group);
+        eeepc_hwmon_device = NULL;
+}
+
+static void __exit eeepc_laptop_exit(void)
+{
+        eeepc_backlight_exit();
+        eeepc_hwmon_exit();
+        acpi_bus_unregister_driver(&eeepc_hotk_driver);
+        sysfs_remove_group(&platform_device->dev.kobj,
+                           &platform_attribute_group);
+        platform_device_unregister(platform_device);
+        platform_driver_unregister(&platform_driver);
+}
+
+static int eeepc_backlight_init(struct device *dev)
+{
+        struct backlight_device *bd;
+
+        bd = backlight_device_register(EEEPC_HOTK_FILE, dev,
+                                       NULL, &eeepcbl_ops);
+        if (IS_ERR(bd)) {
+                printk(EEEPC_ERR
+                       "Could not register eeepc backlight device\n");
+                eeepc_backlight_device = NULL;
+                return PTR_ERR(bd);
+        }
+        eeepc_backlight_device = bd;
+        bd->props.max_brightness = 15;
+        bd->props.brightness = read_brightness(NULL);
+        bd->props.power = FB_BLANK_UNBLANK;
+        backlight_update_status(bd);
+        return 0;
+}
+
+static int eeepc_hwmon_init(struct device *dev)
+{
+        struct device *hwmon;
+        int result;
+
+        hwmon = hwmon_device_register(dev);
+        if (IS_ERR(hwmon)) {
+                printk(EEEPC_ERR
+                       "Could not register eeepc hwmon device\n");
+                eeepc_hwmon_device = NULL;
+                return PTR_ERR(hwmon);
+        }
+        eeepc_hwmon_device = hwmon;
+        result = sysfs_create_group(&hwmon->kobj,
+                                    &hwmon_attribute_group);
+        if (result)
+                eeepc_hwmon_exit();
+        return result;
+}
+
+static int __init eeepc_laptop_init(void)
+{
+        struct device *dev;
+        int result;
+
+        if (acpi_disabled)
+                return -ENODEV;
+        result = acpi_bus_register_driver(&eeepc_hotk_driver);
+        if (result < 0)
+                return result;
+        if (!ehotk) {
+                acpi_bus_unregister_driver(&eeepc_hotk_driver);
+                return -ENODEV;
+        }
+        dev = acpi_get_physical_device(ehotk->device->handle);
+        result = eeepc_backlight_init(dev);
+        if (result)
+                goto fail_backlight;
+        result = eeepc_hwmon_init(dev);
+        if (result)
+                goto fail_hwmon;
+        /* Register platform stuff */
+        result = platform_driver_register(&platform_driver);
+        if (result)
+                goto fail_platform_driver;
+        platform_device = platform_device_alloc(EEEPC_HOTK_FILE, -1);
+        if (!platform_device) {
+                result = -ENOMEM;
+                goto fail_platform_device1;
+        }
+        result = platform_device_add(platform_device);
+        if (result)
+                goto fail_platform_device2;
+        result = sysfs_create_group(&platform_device->dev.kobj,
+                                    &platform_attribute_group);
+        if (result)
+                goto fail_sysfs;
+        return 0;
+fail_sysfs:
+        platform_device_del(platform_device);
+fail_platform_device2:
+        platform_device_put(platform_device);
+fail_platform_device1:
+        platform_driver_unregister(&platform_driver);
+fail_platform_driver:
+        eeepc_hwmon_exit();
+fail_hwmon:
+        eeepc_backlight_exit();
+fail_backlight:
+        return result;
+}
+
+module_init(eeepc_laptop_init);
+module_exit(eeepc_laptop_exit);
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 6cb781262f94..3f28f6eabdbf 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -21,7 +21,7 @@
  *  02110-1301, USA.
  */
 
-#define TPACPI_VERSION "0.19"
+#define TPACPI_VERSION "0.20"
 #define TPACPI_SYSFS_VERSION 0x020200
 
 /*
@@ -67,6 +67,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/input.h>
+#include <linux/leds.h>
 #include <asm/uaccess.h>
 
 #include <linux/dmi.h>
@@ -85,6 +86,8 @@
 #define TP_CMOS_VOLUME_MUTE     2
 #define TP_CMOS_BRIGHTNESS_UP   4
 #define TP_CMOS_BRIGHTNESS_DOWN 5
+#define TP_CMOS_THINKLIGHT_ON   12
+#define TP_CMOS_THINKLIGHT_OFF  13
 
 /* NVRAM Addresses */
 enum tp_nvram_addr {
@@ -133,8 +136,12 @@ enum {
 #define TPACPI_PROC_DIR "ibm"
 #define TPACPI_ACPI_EVENT_PREFIX "ibm"
 #define TPACPI_DRVR_NAME TPACPI_FILE
+#define TPACPI_DRVR_SHORTNAME "tpacpi"
 #define TPACPI_HWMON_DRVR_NAME TPACPI_NAME "_hwmon"
 
+#define TPACPI_NVRAM_KTHREAD_NAME "ktpacpi_nvramd"
+#define TPACPI_WORKQUEUE_NAME "ktpacpid"
+
 #define TPACPI_MAX_ACPI_ARGS 3
 
 /* Debugging */
@@ -225,6 +232,7 @@ static struct {
         u32 light:1;
         u32 light_status:1;
         u32 bright_16levels:1;
+        u32 bright_acpimode:1;
         u32 wan:1;
         u32 fan_ctrl_status_undef:1;
         u32 input_device_registered:1;
@@ -236,6 +244,11 @@ static struct {
         u32 hotkey_poll_active:1;
 } tp_features;
 
+static struct {
+        u16 hotkey_mask_ff:1;
+        u16 bright_cmos_ec_unsync:1;
+} tp_warned;
+
 struct thinkpad_id_data {
         unsigned int vendor;    /* ThinkPad vendor:
                                  * PCI_VENDOR_ID_IBM/PCI_VENDOR_ID_LENOVO */
@@ -246,7 +259,8 @@ struct thinkpad_id_data {
         u16 bios_model;         /* Big Endian, TP-1Y = 0x5931, 0 = unknown */
         u16 ec_model;
 
-        char *model_str;
+        char *model_str;        /* ThinkPad T43 */
+        char *nummodel_str;     /* 9384A9C for a 9384-A9C model */
 };
 static struct thinkpad_id_data thinkpad_id;
 
@@ -259,6 +273,16 @@ static enum {
 static int experimental;
 static u32 dbg_level;
 
+static struct workqueue_struct *tpacpi_wq;
+
+/* Special LED class that can defer work */
+struct tpacpi_led_classdev {
+        struct led_classdev led_classdev;
+        struct work_struct work;
+        enum led_brightness new_brightness;
+        unsigned int led;
+};
+
 /****************************************************************************
  ****************************************************************************
  *
@@ -807,6 +831,80 @@ static int parse_strtoul(const char *buf,
         return 0;
 }
 
+static int __init tpacpi_query_bcl_levels(acpi_handle handle)
+{
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        int rc;
+
+        if (ACPI_SUCCESS(acpi_evaluate_object(handle, NULL, NULL, &buffer))) {
+                obj = (union acpi_object *)buffer.pointer;
+                if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
+                        printk(TPACPI_ERR "Unknown _BCL data, "
+                               "please report this to %s\n", TPACPI_MAIL);
+                        rc = 0;
+                } else {
+                        rc = obj->package.count;
+                }
+        } else {
+                return 0;
+        }
+
+        kfree(buffer.pointer);
+        return rc;
+}
+
+static acpi_status __init tpacpi_acpi_walk_find_bcl(acpi_handle handle,
+                                        u32 lvl, void *context, void **rv)
+{
+        char name[ACPI_PATH_SEGMENT_LENGTH];
+        struct acpi_buffer buffer = { sizeof(name), &name };
+
+        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
+            !strncmp("_BCL", name, sizeof(name) - 1)) {
+                BUG_ON(!rv || !*rv);
+                **(int **)rv = tpacpi_query_bcl_levels(handle);
+                return AE_CTRL_TERMINATE;
+        } else {
+                return AE_OK;
+        }
+}
+
+/*
+ * Returns 0 (no ACPI _BCL or _BCL invalid), or size of brightness map
+ */
+static int __init tpacpi_check_std_acpi_brightness_support(void)
+{
+        int status;
+        int bcl_levels = 0;
+        void *bcl_ptr = &bcl_levels;
+
+        if (!vid_handle) {
+                TPACPI_ACPIHANDLE_INIT(vid);
+        }
+        if (!vid_handle)
+                return 0;
+
+        /*
+         * Search for a _BCL method, and execute it.  This is safe on all
+         * ThinkPads, and as a side-effect, _BCL will place a Lenovo Vista
+         * BIOS in ACPI backlight control mode.  We do NOT have to care
+         * about calling the _BCL method in an enabled video device, any
+         * will do for our purposes.
+         */
+
+        status = acpi_walk_namespace(ACPI_TYPE_METHOD, vid_handle, 3,
+                                     tpacpi_acpi_walk_find_bcl, NULL,
+                                     &bcl_ptr);
+
+        if (ACPI_SUCCESS(status) && bcl_levels > 2) {
+                tp_features.bright_acpimode = 1;
+                return (bcl_levels - 2);
+        }
+
+        return 0;
+}
+
 /*************************************************************************
  * thinkpad-acpi driver attributes
  */
@@ -909,12 +1007,14 @@ static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
                         thinkpad_id.ec_version_str : "unknown");
 
         if (thinkpad_id.vendor && thinkpad_id.model_str)
-                printk(TPACPI_INFO "%s %s\n",
+                printk(TPACPI_INFO "%s %s, model %s\n",
                         (thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
                                 "IBM" : ((thinkpad_id.vendor ==
                                                 PCI_VENDOR_ID_LENOVO) ?
                                         "Lenovo" : "Unknown vendor"),
-                        thinkpad_id.model_str);
+                        thinkpad_id.model_str,
+                        (thinkpad_id.nummodel_str) ?
+                                thinkpad_id.nummodel_str : "unknown");
 
         return 0;
 }
@@ -1107,6 +1207,19 @@ static int hotkey_mask_set(u32 mask)
         int rc = 0;
 
         if (tp_features.hotkey_mask) {
+                if (!tp_warned.hotkey_mask_ff &&
+                    (mask == 0xffff || mask == 0xffffff ||
+                     mask == 0xffffffff)) {
+                        tp_warned.hotkey_mask_ff = 1;
+                        printk(TPACPI_NOTICE
+                               "setting the hotkey mask to 0x%08x is likely "
+                               "not the best way to go about it\n", mask);
+                        printk(TPACPI_NOTICE
+                               "please consider using the driver defaults, "
+                               "and refer to up-to-date thinkpad-acpi "
+                               "documentation\n");
+                }
+
                 HOTKEY_CONFIG_CRITICAL_START
                 for (i = 0; i < 32; i++) {
                         u32 m = 1 << i;
@@ -1427,8 +1540,7 @@ static void hotkey_poll_setup(int may_warn)
             (tpacpi_inputdev->users > 0 || hotkey_report_mode < 2)) {
                 if (!tpacpi_hotkey_task) {
                         tpacpi_hotkey_task = kthread_run(hotkey_kthread,
-                                                         NULL,
-                                                         TPACPI_FILE "d");
+                                        NULL, TPACPI_NVRAM_KTHREAD_NAME);
                         if (IS_ERR(tpacpi_hotkey_task)) {
                                 tpacpi_hotkey_task = NULL;
                                 printk(TPACPI_ERR
@@ -1887,6 +1999,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                 KEY_UNKNOWN,    /* 0x0D: FN+INSERT */
                 KEY_UNKNOWN,    /* 0x0E: FN+DELETE */
 
+                /* These either have to go through ACPI video, or
+                 * act like in the IBM ThinkPads, so don't ever
+                 * enable them by default */
                 KEY_RESERVED,   /* 0x0F: FN+HOME (brightness up) */
                 KEY_RESERVED,   /* 0x10: FN+END (brightness down) */
 
@@ -2091,6 +2206,32 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                         set_bit(SW_TABLET_MODE, tpacpi_inputdev->swbit);
                 }
 
+                /* Do not issue duplicate brightness change events to
+                 * userspace */
+                if (!tp_features.bright_acpimode)
+                        /* update bright_acpimode... */
+                        tpacpi_check_std_acpi_brightness_support();
+
+                if (tp_features.bright_acpimode) {
+                        printk(TPACPI_INFO
+                               "This ThinkPad has standard ACPI backlight "
+                               "brightness control, supported by the ACPI "
+                               "video driver\n");
+                        printk(TPACPI_NOTICE
+                               "Disabling thinkpad-acpi brightness events "
+                               "by default...\n");
+
+                        /* The hotkey_reserved_mask change below is not
+                         * necessary while the keys are at KEY_RESERVED in the
+                         * default map, but better safe than sorry, leave it
+                         * here as a marker of what we have to do, especially
+                         * when we finally become able to set this at runtime
+                         * on response to X.org requests */
+                        hotkey_reserved_mask |=
+                                (1 << TP_ACPI_HOTKEYSCAN_FNHOME)
+                                | (1 << TP_ACPI_HOTKEYSCAN_FNEND);
+                }
+
                 dbg_printk(TPACPI_DBG_INIT,
                                 "enabling hot key handling\n");
                 res = hotkey_status_set(1);
@@ -3110,13 +3251,82 @@ static struct ibm_struct video_driver_data = {
 TPACPI_HANDLE(lght, root, "\\LGHT");    /* A21e, A2xm/p, T20-22, X20-21 */
 TPACPI_HANDLE(ledb, ec, "LEDB");                /* G4x */
 
+static int light_get_status(void)
+{
+        int status = 0;
+
+        if (tp_features.light_status) {
+                if (!acpi_evalf(ec_handle, &status, "KBLT", "d"))
+                        return -EIO;
+                return (!!status);
+        }
+
+        return -ENXIO;
+}
+
+static int light_set_status(int status)
+{
+        int rc;
+
+        if (tp_features.light) {
+                if (cmos_handle) {
+                        rc = acpi_evalf(cmos_handle, NULL, NULL, "vd",
+                                        (status)?
+                                                TP_CMOS_THINKLIGHT_ON :
+                                                TP_CMOS_THINKLIGHT_OFF);
+                } else {
+                        rc = acpi_evalf(lght_handle, NULL, NULL, "vd",
+                                        (status)? 1 : 0);
+                }
+                return (rc)? 0 : -EIO;
+        }
+
+        return -ENXIO;
+}
+
+static void light_set_status_worker(struct work_struct *work)
+{
+        struct tpacpi_led_classdev *data =
+                        container_of(work, struct tpacpi_led_classdev, work);
+
+        if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING))
+                light_set_status((data->new_brightness != LED_OFF));
+}
+
+static void light_sysfs_set(struct led_classdev *led_cdev,
+                        enum led_brightness brightness)
+{
+        struct tpacpi_led_classdev *data =
+                container_of(led_cdev,
+                             struct tpacpi_led_classdev,
+                             led_classdev);
+        data->new_brightness = brightness;
+        queue_work(tpacpi_wq, &data->work);
+}
+
+static enum led_brightness light_sysfs_get(struct led_classdev *led_cdev)
+{
+        return (light_get_status() == 1)? LED_FULL : LED_OFF;
+}
+
+static struct tpacpi_led_classdev tpacpi_led_thinklight = {
+        .led_classdev = {
+                .name           = "tpacpi::thinklight",
+                .brightness_set = &light_sysfs_set,
+                .brightness_get = &light_sysfs_get,
+        }
+};
+
 static int __init light_init(struct ibm_init_struct *iibm)
 {
+        int rc = 0;
+
         vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n");
 
         TPACPI_ACPIHANDLE_INIT(ledb);
         TPACPI_ACPIHANDLE_INIT(lght);
         TPACPI_ACPIHANDLE_INIT(cmos);
+        INIT_WORK(&tpacpi_led_thinklight.work, light_set_status_worker);
 
         /* light not supported on 570, 600e/x, 770e, 770x, G4x, R30, R31 */
         tp_features.light = (cmos_handle || lght_handle) && !ledb_handle;
@@ -3130,13 +3340,31 @@ static int __init light_init(struct ibm_init_struct *iibm)
         vdbg_printk(TPACPI_DBG_INIT, "light is %s\n",
                 str_supported(tp_features.light));
 
-        return (tp_features.light)? 0 : 1;
+        if (tp_features.light) {
+                rc = led_classdev_register(&tpacpi_pdev->dev,
+                                           &tpacpi_led_thinklight.led_classdev);
+        }
+
+        if (rc < 0) {
+                tp_features.light = 0;
+                tp_features.light_status = 0;
+        } else {
+                rc = (tp_features.light)? 0 : 1;
+        }
+        return rc;
+}
+
+static void light_exit(void)
+{
+        led_classdev_unregister(&tpacpi_led_thinklight.led_classdev);
+        if (work_pending(&tpacpi_led_thinklight.work))
+                flush_workqueue(tpacpi_wq);
 }
 
 static int light_read(char *p)
 {
         int len = 0;
-        int status = 0;
+        int status;
 
         if (!tp_features.light) {
                 len += sprintf(p + len, "status:\t\tnot supported\n");
@@ -3144,8 +3372,9 @@ static int light_read(char *p)
                 len += sprintf(p + len, "status:\t\tunknown\n");
                 len += sprintf(p + len, "commands:\ton, off\n");
         } else {
-                if (!acpi_evalf(ec_handle, &status, "KBLT", "d"))
-                        return -EIO;
+                status = light_get_status();
+                if (status < 0)
+                        return status;
                 len += sprintf(p + len, "status:\t\t%s\n", onoff(status, 0));
                 len += sprintf(p + len, "commands:\ton, off\n");
         }
@@ -3155,37 +3384,29 @@ static int light_read(char *p)
 
 static int light_write(char *buf)
 {
-        int cmos_cmd, lght_cmd;
         char *cmd;
-        int success;
+        int newstatus = 0;
 
         if (!tp_features.light)
                 return -ENODEV;
 
         while ((cmd = next_cmd(&buf))) {
                 if (strlencmp(cmd, "on") == 0) {
-                        cmos_cmd = 0x0c;
-                        lght_cmd = 1;
+                        newstatus = 1;
                 } else if (strlencmp(cmd, "off") == 0) {
-                        cmos_cmd = 0x0d;
-                        lght_cmd = 0;
+                        newstatus = 0;
                 } else
                         return -EINVAL;
-
-                success = cmos_handle ?
-                    acpi_evalf(cmos_handle, NULL, NULL, "vd", cmos_cmd) :
-                    acpi_evalf(lght_handle, NULL, NULL, "vd", lght_cmd);
-                if (!success)
-                        return -EIO;
         }
 
-        return 0;
+        return light_set_status(newstatus);
 }
 
 static struct ibm_struct light_driver_data = {
         .name = "light",
         .read = light_read,
         .write = light_write,
+        .exit = light_exit,
 };
 
 /*************************************************************************
@@ -3583,6 +3804,12 @@ enum {	/* For TPACPI_LED_OLD */
         TPACPI_LED_EC_HLMS = 0x0e,      /* EC reg to select led to command */
 };
 
+enum led_status_t {
+        TPACPI_LED_OFF = 0,
+        TPACPI_LED_ON,
+        TPACPI_LED_BLINK,
+};
+
 static enum led_access_mode led_supported;
 
 TPACPI_HANDLE(led, ec, "SLED",  /* 570 */
@@ -3591,8 +3818,174 @@ TPACPI_HANDLE(led, ec, "SLED",	/* 570 */
            "LED",               /* all others */
            );                   /* R30, R31 */
 
+#define TPACPI_LED_NUMLEDS 8
+static struct tpacpi_led_classdev *tpacpi_leds;
+static enum led_status_t tpacpi_led_state_cache[TPACPI_LED_NUMLEDS];
+static const char const *tpacpi_led_names[TPACPI_LED_NUMLEDS] = {
+        /* there's a limit of 19 chars + NULL before 2.6.26 */
+        "tpacpi::power",
+        "tpacpi:orange:batt",
+        "tpacpi:green:batt",
+        "tpacpi::dock_active",
+        "tpacpi::bay_active",
+        "tpacpi::dock_batt",
+        "tpacpi::unknown_led",
+        "tpacpi::standby",
+};
+
+static int led_get_status(unsigned int led)
+{
+        int status;
+        enum led_status_t led_s;
+
+        switch (led_supported) {
+        case TPACPI_LED_570:
+                if (!acpi_evalf(ec_handle,
+                                &status, "GLED", "dd", 1 << led))
+                        return -EIO;
+                led_s = (status == 0)?
+                                TPACPI_LED_OFF :
+                                ((status == 1)?
+                                        TPACPI_LED_ON :
+                                        TPACPI_LED_BLINK);
+                tpacpi_led_state_cache[led] = led_s;
+                return led_s;
+        default:
+                return -ENXIO;
+        }
+
+        /* not reached */
+}
+
+static int led_set_status(unsigned int led, enum led_status_t ledstatus)
+{
+        /* off, on, blink. Index is led_status_t */
+        static const int const led_sled_arg1[] = { 0, 1, 3 };
+        static const int const led_exp_hlbl[] = { 0, 0, 1 };    /* led# * */
+        static const int const led_exp_hlcl[] = { 0, 1, 1 };    /* led# * */
+        static const int const led_led_arg1[] = { 0, 0x80, 0xc0 };
+
+        int rc = 0;
+
+        switch (led_supported) {
+        case TPACPI_LED_570:
+                        /* 570 */
+                        led = 1 << led;
+                        if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
+                                        led, led_sled_arg1[ledstatus]))
+                                rc = -EIO;
+                        break;
+        case TPACPI_LED_OLD:
+                        /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */
+                        led = 1 << led;
+                        rc = ec_write(TPACPI_LED_EC_HLMS, led);
+                        if (rc >= 0)
+                                rc = ec_write(TPACPI_LED_EC_HLBL,
+                                              led * led_exp_hlbl[ledstatus]);
+                        if (rc >= 0)
+                                rc = ec_write(TPACPI_LED_EC_HLCL,
+                                              led * led_exp_hlcl[ledstatus]);
+                        break;
+        case TPACPI_LED_NEW:
+                        /* all others */
+                        if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
+                                        led, led_led_arg1[ledstatus]))
+                                rc = -EIO;
+                        break;
+        default:
+                rc = -ENXIO;
+        }
+
+        if (!rc)
+                tpacpi_led_state_cache[led] = ledstatus;
+
+        return rc;
+}
+
+static void led_sysfs_set_status(unsigned int led,
+                                 enum led_brightness brightness)
+{
+        led_set_status(led,
+                        (brightness == LED_OFF) ?
+                        TPACPI_LED_OFF :
+                        (tpacpi_led_state_cache[led] == TPACPI_LED_BLINK) ?
+                                TPACPI_LED_BLINK : TPACPI_LED_ON);
+}
+
+static void led_set_status_worker(struct work_struct *work)
+{
+        struct tpacpi_led_classdev *data =
+                container_of(work, struct tpacpi_led_classdev, work);
+
+        if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING))
+                led_sysfs_set_status(data->led, data->new_brightness);
+}
+
+static void led_sysfs_set(struct led_classdev *led_cdev,
+                        enum led_brightness brightness)
+{
+        struct tpacpi_led_classdev *data = container_of(led_cdev,
+                             struct tpacpi_led_classdev, led_classdev);
+
+        data->new_brightness = brightness;
+        queue_work(tpacpi_wq, &data->work);
+}
+
+static int led_sysfs_blink_set(struct led_classdev *led_cdev,
+                        unsigned long *delay_on, unsigned long *delay_off)
+{
+        struct tpacpi_led_classdev *data = container_of(led_cdev,
+                             struct tpacpi_led_classdev, led_classdev);
+
+        /* Can we choose the flash rate? */
+        if (*delay_on == 0 && *delay_off == 0) {
+                /* yes. set them to the hardware blink rate (1 Hz) */
+                *delay_on = 500; /* ms */
+                *delay_off = 500; /* ms */
+        } else if ((*delay_on != 500) || (*delay_off != 500))
+                return -EINVAL;
+
+        data->new_brightness = TPACPI_LED_BLINK;
+        queue_work(tpacpi_wq, &data->work);
+
+        return 0;
+}
+
+static enum led_brightness led_sysfs_get(struct led_classdev *led_cdev)
+{
+        int rc;
+
+        struct tpacpi_led_classdev *data = container_of(led_cdev,
+                             struct tpacpi_led_classdev, led_classdev);
+
+        rc = led_get_status(data->led);
+
+        if (rc == TPACPI_LED_OFF || rc < 0)
+                rc = LED_OFF;   /* no error handling in led class :( */
+        else
+                rc = LED_FULL;
+
+        return rc;
+}
+
+static void led_exit(void)
+{
+        unsigned int i;
+
+        for (i = 0; i < TPACPI_LED_NUMLEDS; i++) {
+                if (tpacpi_leds[i].led_classdev.name)
+                        led_classdev_unregister(&tpacpi_leds[i].led_classdev);
+        }
+
+        kfree(tpacpi_leds);
+        tpacpi_leds = NULL;
+}
+
 static int __init led_init(struct ibm_init_struct *iibm)
 {
+        unsigned int i;
+        int rc;
+
         vdbg_printk(TPACPI_DBG_INIT, "initializing LED subdriver\n");
 
         TPACPI_ACPIHANDLE_INIT(led);
@@ -3613,10 +4006,41 @@ static int __init led_init(struct ibm_init_struct *iibm)
         vdbg_printk(TPACPI_DBG_INIT, "LED commands are %s, mode %d\n",
                 str_supported(led_supported), led_supported);
 
+        tpacpi_leds = kzalloc(sizeof(*tpacpi_leds) * TPACPI_LED_NUMLEDS,
+                              GFP_KERNEL);
+        if (!tpacpi_leds) {
+                printk(TPACPI_ERR "Out of memory for LED data\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < TPACPI_LED_NUMLEDS; i++) {
+                tpacpi_leds[i].led = i;
+
+                tpacpi_leds[i].led_classdev.brightness_set = &led_sysfs_set;
+                tpacpi_leds[i].led_classdev.blink_set = &led_sysfs_blink_set;
+                if (led_supported == TPACPI_LED_570)
+                        tpacpi_leds[i].led_classdev.brightness_get =
+                                                        &led_sysfs_get;
+
+                tpacpi_leds[i].led_classdev.name = tpacpi_led_names[i];
+
+                INIT_WORK(&tpacpi_leds[i].work, led_set_status_worker);
+
+                rc = led_classdev_register(&tpacpi_pdev->dev,
+                                           &tpacpi_leds[i].led_classdev);
+                if (rc < 0) {
+                        tpacpi_leds[i].led_classdev.name = NULL;
+                        led_exit();
+                        return rc;
+                }
+        }
+
         return (led_supported != TPACPI_LED_NONE)? 0 : 1;
 }
 
-#define led_status(s) ((s) == 0 ? "off" : ((s) == 1 ? "on" : "blinking"))
+#define str_led_status(s) \
+        ((s) == TPACPI_LED_OFF ? "off" : \
+                ((s) == TPACPI_LED_ON ? "on" : "blinking"))
 
 static int led_read(char *p)
 {
@@ -3632,11 +4056,11 @@ static int led_read(char *p)
                 /* 570 */
                 int i, status;
                 for (i = 0; i < 8; i++) {
-                        if (!acpi_evalf(ec_handle,
-                                        &status, "GLED", "dd", 1 << i))
+                        status = led_get_status(i);
+                        if (status < 0)
                                 return -EIO;
                         len += sprintf(p + len, "%d:\t\t%s\n",
-                                       i, led_status(status));
+                                       i, str_led_status(status));
                 }
         }
 
@@ -3646,16 +4070,11 @@ static int led_read(char *p)
         return len;
 }
 
-/* off, on, blink */
-static const int led_sled_arg1[] = { 0, 1, 3 };
-static const int led_exp_hlbl[] = { 0, 0, 1 };  /* led# * */
-static const int led_exp_hlcl[] = { 0, 1, 1 };  /* led# * */
-static const int led_led_arg1[] = { 0, 0x80, 0xc0 };
-
 static int led_write(char *buf)
 {
         char *cmd;
-        int led, ind, ret;
+        int led, rc;
+        enum led_status_t s;
 
         if (!led_supported)
                 return -ENODEV;
@@ -3665,38 +4084,18 @@ static int led_write(char *buf)
                         return -EINVAL;
 
                 if (strstr(cmd, "off")) {
-                        ind = 0;
+                        s = TPACPI_LED_OFF;
                 } else if (strstr(cmd, "on")) {
-                        ind = 1;
+                        s = TPACPI_LED_ON;
                 } else if (strstr(cmd, "blink")) {
-                        ind = 2;
-                } else
-                        return -EINVAL;
-
-                if (led_supported == TPACPI_LED_570) {
-                        /* 570 */
-                        led = 1 << led;
-                        if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
-                                        led, led_sled_arg1[ind]))
-                                return -EIO;
-                } else if (led_supported == TPACPI_LED_OLD) {
-                        /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */
-                        led = 1 << led;
-                        ret = ec_write(TPACPI_LED_EC_HLMS, led);
-                        if (ret >= 0)
-                                ret = ec_write(TPACPI_LED_EC_HLBL,
-                                                led * led_exp_hlbl[ind]);
-                        if (ret >= 0)
-                                ret = ec_write(TPACPI_LED_EC_HLCL,
-                                                led * led_exp_hlcl[ind]);
-                        if (ret < 0)
-                                return ret;
+                        s = TPACPI_LED_BLINK;
                 } else {
-                        /* all others */
-                        if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
-                                        led, led_led_arg1[ind]))
-                                return -EIO;
+                        return -EINVAL;
                 }
+
+                rc = led_set_status(led, s);
+                if (rc < 0)
+                        return rc;
         }
 
         return 0;
@@ -3706,6 +4105,7 @@ static struct ibm_struct led_driver_data = {
         .name = "led",
         .read = led_read,
         .write = led_write,
+        .exit = led_exit,
 };
 
 /*************************************************************************
@@ -4170,8 +4570,16 @@ static struct ibm_struct ecdump_driver_data = {
 
 #define TPACPI_BACKLIGHT_DEV_NAME "thinkpad_screen"
 
+enum {
+        TP_EC_BACKLIGHT = 0x31,
+
+        /* TP_EC_BACKLIGHT bitmasks */
+        TP_EC_BACKLIGHT_LVLMSK = 0x1F,
+        TP_EC_BACKLIGHT_CMDMSK = 0xE0,
+        TP_EC_BACKLIGHT_MAPSW = 0x20,
+};
+
 static struct backlight_device *ibm_backlight_device;
-static int brightness_offset = 0x31;
 static int brightness_mode;
 static unsigned int brightness_enable = 2; /* 2 = auto, 0 = no, 1 = yes */
 
@@ -4180,16 +4588,24 @@ static struct mutex brightness_mutex;
 /*
  * ThinkPads can read brightness from two places: EC 0x31, or
  * CMOS NVRAM byte 0x5E, bits 0-3.
+ *
+ * EC 0x31 has the following layout
+ *   Bit 7: unknown function
+ *   Bit 6: unknown function
+ *   Bit 5: Z: honour scale changes, NZ: ignore scale changes
+ *   Bit 4: must be set to zero to avoid problems
+ *   Bit 3-0: backlight brightness level
+ *
+ * brightness_get_raw returns status data in the EC 0x31 layout
  */
-static int brightness_get(struct backlight_device *bd)
+static int brightness_get_raw(int *status)
 {
         u8 lec = 0, lcmos = 0, level = 0;
 
         if (brightness_mode & 1) {
-                if (!acpi_ec_read(brightness_offset, &lec))
+                if (!acpi_ec_read(TP_EC_BACKLIGHT, &lec))
                         return -EIO;
-                lec &= (tp_features.bright_16levels)? 0x0f : 0x07;
-                level = lec;
+                level = lec & TP_EC_BACKLIGHT_LVLMSK;
         };
         if (brightness_mode & 2) {
                 lcmos = (nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
@@ -4199,16 +4615,27 @@ static int brightness_get(struct backlight_device *bd)
                 level = lcmos;
         }
 
-        if (brightness_mode == 3 && lec != lcmos) {
-                printk(TPACPI_ERR
-                        "CMOS NVRAM (%u) and EC (%u) do not agree "
-                        "on display brightness level\n",
-                        (unsigned int) lcmos,
-                        (unsigned int) lec);
-                return -EIO;
+        if (brightness_mode == 3) {
+                *status = lec;  /* Prefer EC, CMOS is just a backing store */
+                lec &= TP_EC_BACKLIGHT_LVLMSK;
+                if (lec == lcmos)
+                        tp_warned.bright_cmos_ec_unsync = 0;
+                else {
+                        if (!tp_warned.bright_cmos_ec_unsync) {
+                                printk(TPACPI_ERR
+                                        "CMOS NVRAM (%u) and EC (%u) do not "
+                                        "agree on display brightness level\n",
+                                        (unsigned int) lcmos,
+                                        (unsigned int) lec);
+                                tp_warned.bright_cmos_ec_unsync = 1;
+                        }
+                        return -EIO;
+                }
+        } else {
+                *status = level;
         }
 
-        return level;
+        return 0;
 }
 
 /* May return EINTR which can always be mapped to ERESTARTSYS */
@@ -4216,19 +4643,22 @@ static int brightness_set(int value)
 {
         int cmos_cmd, inc, i, res;
         int current_value;
+        int command_bits;
 
-        if (value > ((tp_features.bright_16levels)? 15 : 7))
+        if (value > ((tp_features.bright_16levels)? 15 : 7) ||
+            value < 0)
                 return -EINVAL;
 
         res = mutex_lock_interruptible(&brightness_mutex);
         if (res < 0)
                 return res;
 
-        current_value = brightness_get(NULL);
-        if (current_value < 0) {
-                res = current_value;
+        res = brightness_get_raw(&current_value);
+        if (res < 0)
                 goto errout;
-        }
+
+        command_bits = current_value & TP_EC_BACKLIGHT_CMDMSK;
+        current_value &= TP_EC_BACKLIGHT_LVLMSK;
 
         cmos_cmd = value > current_value ?
                         TP_CMOS_BRIGHTNESS_UP :
@@ -4243,7 +4673,8 @@ static int brightness_set(int value)
                         goto errout;
                 }
                 if ((brightness_mode & 1) &&
-                    !acpi_ec_write(brightness_offset, i + inc)) {
+                    !acpi_ec_write(TP_EC_BACKLIGHT,
+                                   (i + inc) | command_bits)) {
                         res = -EIO;
                         goto errout;;
                 }
@@ -4266,106 +4697,23 @@ static int brightness_update_status(struct backlight_device *bd)
                                 bd->props.brightness : 0);
 }
 
-static struct backlight_ops ibm_backlight_data = {
-        .get_brightness = brightness_get,
-        .update_status  = brightness_update_status,
-};
-
-/* --------------------------------------------------------------------- */
-
-static int __init tpacpi_query_bcll_levels(acpi_handle handle)
-{
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object *obj;
-        int rc;
-
-        if (ACPI_SUCCESS(acpi_evaluate_object(handle, NULL, NULL, &buffer))) {
-                obj = (union acpi_object *)buffer.pointer;
-                if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
-                        printk(TPACPI_ERR "Unknown BCLL data, "
-                               "please report this to %s\n", TPACPI_MAIL);
-                        rc = 0;
-                } else {
-                        rc = obj->package.count;
-                }
-        } else {
-                return 0;
-        }
-
-        kfree(buffer.pointer);
-        return rc;
-}
-
-static acpi_status __init brightness_find_bcll(acpi_handle handle, u32 lvl,
-                                        void *context, void **rv)
-{
-        char name[ACPI_PATH_SEGMENT_LENGTH];
-        struct acpi_buffer buffer = { sizeof(name), &name };
-
-        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
-            !strncmp("BCLL", name, sizeof(name) - 1)) {
-                if (tpacpi_query_bcll_levels(handle) == 16) {
-                        *rv = handle;
-                        return AE_CTRL_TERMINATE;
-                } else {
-                        return AE_OK;
-                }
-        } else {
-                return AE_OK;
-        }
-}
-
-static int __init brightness_check_levels(void)
+static int brightness_get(struct backlight_device *bd)
 {
-        int status;
-        void *found_node = NULL;
+        int status, res;
 
-        if (!vid_handle) {
-                TPACPI_ACPIHANDLE_INIT(vid);
-        }
-        if (!vid_handle)
-                return 0;
-
-        /* Search for a BCLL package with 16 levels */
-        status = acpi_walk_namespace(ACPI_TYPE_PACKAGE, vid_handle, 3,
-                                        brightness_find_bcll, NULL,
-                                        &found_node);
-
-        return (ACPI_SUCCESS(status) && found_node != NULL);
-}
-
-static acpi_status __init brightness_find_bcl(acpi_handle handle, u32 lvl,
-                                        void *context, void **rv)
-{
-        char name[ACPI_PATH_SEGMENT_LENGTH];
-        struct acpi_buffer buffer = { sizeof(name), &name };
+        res = brightness_get_raw(&status);
+        if (res < 0)
+                return 0; /* FIXME: teach backlight about error handling */
 
-        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
-            !strncmp("_BCL", name, sizeof(name) - 1)) {
-                *rv = handle;
-                return AE_CTRL_TERMINATE;
-        } else {
-                return AE_OK;
-        }
+        return status & TP_EC_BACKLIGHT_LVLMSK;
 }
 
-static int __init brightness_check_std_acpi_support(void)
-{
-        int status;
-        void *found_node = NULL;
-
-        if (!vid_handle) {
-                TPACPI_ACPIHANDLE_INIT(vid);
-        }
-        if (!vid_handle)
-                return 0;
-
-        /* Search for a _BCL method, but don't execute it */
-        status = acpi_walk_namespace(ACPI_TYPE_METHOD, vid_handle, 3,
-                                     brightness_find_bcl, NULL, &found_node);
+static struct backlight_ops ibm_backlight_data = {
+        .get_brightness = brightness_get,
+        .update_status  = brightness_update_status,
+};
 
-        return (ACPI_SUCCESS(status) && found_node != NULL);
-}
+/* --------------------------------------------------------------------- */
 
 static int __init brightness_init(struct ibm_init_struct *iibm)
 {
@@ -4375,13 +4723,19 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
 
         mutex_init(&brightness_mutex);
 
-        if (!brightness_enable) {
-                dbg_printk(TPACPI_DBG_INIT,
-                           "brightness support disabled by "
-                           "module parameter\n");
-                return 1;
-        } else if (brightness_enable > 1) {
-                if (brightness_check_std_acpi_support()) {
+        /*
+         * We always attempt to detect acpi support, so as to switch
+         * Lenovo Vista BIOS to ACPI brightness mode even if we are not
+         * going to publish a backlight interface
+         */
+        b = tpacpi_check_std_acpi_brightness_support();
+        if (b > 0) {
+                if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) {
+                        printk(TPACPI_NOTICE
+                               "Lenovo BIOS switched to ACPI backlight "
+                               "control mode\n");
+                }
+                if (brightness_enable > 1) {
                         printk(TPACPI_NOTICE
                                "standard ACPI backlight interface "
                                "available, not loading native one...\n");
@@ -4389,6 +4743,22 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                 }
         }
 
+        if (!brightness_enable) {
+                dbg_printk(TPACPI_DBG_INIT,
+                           "brightness support disabled by "
+                           "module parameter\n");
+                return 1;
+        }
+
+        if (b > 16) {
+                printk(TPACPI_ERR
+                       "Unsupported brightness interface, "
+                       "please contact %s\n", TPACPI_MAIL);
+                return 1;
+        }
+        if (b == 16)
+                tp_features.bright_16levels = 1;
+
         if (!brightness_mode) {
                 if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO)
                         brightness_mode = 2;
@@ -4402,12 +4772,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
         if (brightness_mode > 3)
                 return -EINVAL;
 
-        tp_features.bright_16levels =
-                        thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO &&
-                        brightness_check_levels();
-
-        b = brightness_get(NULL);
-        if (b < 0)
+        if (brightness_get_raw(&b) < 0)
                 return 1;
 
         if (tp_features.bright_16levels)
@@ -4425,7 +4790,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
 
         ibm_backlight_device->props.max_brightness =
                                 (tp_features.bright_16levels)? 15 : 7;
-        ibm_backlight_device->props.brightness = b;
+        ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
         backlight_update_status(ibm_backlight_device);
 
         return 0;
@@ -5046,11 +5411,11 @@ static void fan_watchdog_reset(void)
         if (fan_watchdog_maxinterval > 0 &&
             tpacpi_lifecycle != TPACPI_LIFE_EXITING) {
                 fan_watchdog_active = 1;
-                if (!schedule_delayed_work(&fan_watchdog_task,
+                if (!queue_delayed_work(tpacpi_wq, &fan_watchdog_task,
                                 msecs_to_jiffies(fan_watchdog_maxinterval
                                                  * 1000))) {
                         printk(TPACPI_ERR
-                               "failed to schedule the fan watchdog, "
+                               "failed to queue the fan watchdog, "
                                "watchdog will not trigger\n");
                 }
         } else
@@ -5420,7 +5785,7 @@ static void fan_exit(void)
                            &driver_attr_fan_watchdog);
 
         cancel_delayed_work(&fan_watchdog_task);
-        flush_scheduled_work();
+        flush_workqueue(tpacpi_wq);
 }
 
 static int fan_read(char *p)
@@ -5826,10 +6191,13 @@ static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
 
         tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION),
                                         GFP_KERNEL);
-        if (strnicmp(tp->model_str, "ThinkPad", 8) != 0) {
+        if (tp->model_str && strnicmp(tp->model_str, "ThinkPad", 8) != 0) {
                 kfree(tp->model_str);
                 tp->model_str = NULL;
         }
+
+        tp->nummodel_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_NAME),
+                                        GFP_KERNEL);
 }
 
 static int __init probe_for_thinkpad(void)
@@ -6071,6 +6439,9 @@ static void thinkpad_acpi_module_exit(void)
         if (proc_dir)
                 remove_proc_entry(TPACPI_PROC_DIR, acpi_root_dir);
 
+        if (tpacpi_wq)
+                destroy_workqueue(tpacpi_wq);
+
         kfree(thinkpad_id.bios_version_str);
         kfree(thinkpad_id.ec_version_str);
         kfree(thinkpad_id.model_str);
@@ -6101,6 +6472,12 @@ static int __init thinkpad_acpi_module_init(void)
         TPACPI_ACPIHANDLE_INIT(ecrd);
         TPACPI_ACPIHANDLE_INIT(ecwr);
 
+        tpacpi_wq = create_singlethread_workqueue(TPACPI_WORKQUEUE_NAME);
+        if (!tpacpi_wq) {
+                thinkpad_acpi_module_exit();
+                return -ENOMEM;
+        }
+
         proc_dir = proc_mkdir(TPACPI_PROC_DIR, acpi_root_dir);
         if (!proc_dir) {
                 printk(TPACPI_ERR
@@ -6223,6 +6600,8 @@ static int __init thinkpad_acpi_module_init(void)
 /* Please remove this in year 2009 */
 MODULE_ALIAS("ibm_acpi");
 
+MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
+
 /*
  * DMI matching for module autoloading
  *
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 31a633f65547..4fe7c58f57e9 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -1,12 +1,78 @@
 extern spinlock_t pnp_lock;
 void *pnp_alloc(long size);
+
+int pnp_register_protocol(struct pnp_protocol *protocol);
+void pnp_unregister_protocol(struct pnp_protocol *protocol);
+
+#define PNP_EISA_ID_MASK 0x7fffffff
+void pnp_eisa_id_to_string(u32 id, char *str);
+struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
+struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
+
+int pnp_add_device(struct pnp_dev *dev);
+struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
 int pnp_interface_attach_device(struct pnp_dev *dev);
+
+int pnp_add_card(struct pnp_card *card);
+struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
+void pnp_remove_card(struct pnp_card *card);
+int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
+void pnp_remove_card_device(struct pnp_dev *dev);
+
+struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
+struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
+                                                 int priority);
+int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_irq *data);
+int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_dma *data);
+int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
+                               struct pnp_port *data);
+int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_mem *data);
+void pnp_init_resources(struct pnp_dev *dev);
+
 void pnp_fixup_device(struct pnp_dev *dev);
 void pnp_free_option(struct pnp_option *option);
 int __pnp_add_device(struct pnp_dev *dev);
 void __pnp_remove_device(struct pnp_dev *dev);
 
-int pnp_check_port(struct pnp_dev * dev, int idx);
-int pnp_check_mem(struct pnp_dev * dev, int idx);
-int pnp_check_irq(struct pnp_dev * dev, int idx);
-int pnp_check_dma(struct pnp_dev * dev, int idx);
+int pnp_check_port(struct pnp_dev *dev, struct resource *res);
+int pnp_check_mem(struct pnp_dev *dev, struct resource *res);
+int pnp_check_irq(struct pnp_dev *dev, struct resource *res);
+int pnp_check_dma(struct pnp_dev *dev, struct resource *res);
+
+void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
+
+void pnp_init_resource(struct resource *res);
+
+struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
+                                          unsigned int type, unsigned int num);
+
+#define PNP_MAX_PORT            40
+#define PNP_MAX_MEM             24
+#define PNP_MAX_IRQ              2
+#define PNP_MAX_DMA              2
+
+struct pnp_resource {
+        struct resource res;
+        unsigned int index;             /* ISAPNP config register index */
+};
+
+struct pnp_resource_table {
+        struct pnp_resource port[PNP_MAX_PORT];
+        struct pnp_resource mem[PNP_MAX_MEM];
+        struct pnp_resource dma[PNP_MAX_DMA];
+        struct pnp_resource irq[PNP_MAX_IRQ];
+};
+
+struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
+                                          int flags);
+struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
+                                          int flags);
+struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
+                                         resource_size_t start,
+                                         resource_size_t end, int flags);
+struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
+                                          resource_size_t start,
+                                          resource_size_t end, int flags);
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index da1c9909eb44..a762a4176736 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include "base.h"
@@ -100,19 +101,33 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
  * @id: pointer to a pnp_id structure
  * @card: pointer to the desired card
  */
-int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card)
+struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
 {
-        struct pnp_id *ptr;
+        struct pnp_id *dev_id, *ptr;
 
-        id->next = NULL;
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        if (!dev_id)
+                return NULL;
+
+        dev_id->id[0] = id[0];
+        dev_id->id[1] = id[1];
+        dev_id->id[2] = id[2];
+        dev_id->id[3] = tolower(id[3]);
+        dev_id->id[4] = tolower(id[4]);
+        dev_id->id[5] = tolower(id[5]);
+        dev_id->id[6] = tolower(id[6]);
+        dev_id->id[7] = '\0';
+
+        dev_id->next = NULL;
         ptr = card->id;
         while (ptr && ptr->next)
                 ptr = ptr->next;
         if (ptr)
-                ptr->next = id;
+                ptr->next = dev_id;
         else
-                card->id = id;
-        return 0;
+                card->id = dev_id;
+
+        return dev_id;
 }
 
 static void pnp_free_card_ids(struct pnp_card *card)
@@ -136,6 +151,31 @@ static void pnp_release_card(struct device *dmdev)
         kfree(card);
 }
 
+struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnpid)
+{
+        struct pnp_card *card;
+        struct pnp_id *dev_id;
+
+        card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL);
+        if (!card)
+                return NULL;
+
+        card->protocol = protocol;
+        card->number = id;
+
+        card->dev.parent = &card->protocol->dev;
+        sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
+                card->number);
+
+        dev_id = pnp_add_card_id(card, pnpid);
+        if (!dev_id) {
+                kfree(card);
+                return NULL;
+        }
+
+        return card;
+}
+
 static ssize_t pnp_show_card_name(struct device *dmdev,
                                   struct device_attribute *attr, char *buf)
 {
@@ -191,9 +231,6 @@ int pnp_add_card(struct pnp_card *card)
         int error;
         struct list_head *pos, *temp;
 
-        sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
-                card->number);
-        card->dev.parent = &card->protocol->dev;
         card->dev.bus = NULL;
         card->dev.release = &pnp_release_card;
         error = device_register(&card->dev);
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 7d366ca672d3..20771b7d4482 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -106,18 +106,53 @@ static void pnp_release_device(struct device *dmdev)
         pnp_free_option(dev->independent);
         pnp_free_option(dev->dependent);
         pnp_free_ids(dev);
+        kfree(dev->res);
         kfree(dev);
 }
 
-int __pnp_add_device(struct pnp_dev *dev)
+struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)
 {
-        int ret;
+        struct pnp_dev *dev;
+        struct pnp_id *dev_id;
 
-        pnp_fixup_device(dev);
+        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        dev->res = kzalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
+        if (!dev->res) {
+                kfree(dev);
+                return NULL;
+        }
+
+        dev->protocol = protocol;
+        dev->number = id;
+        dev->dma_mask = DMA_24BIT_MASK;
+
+        dev->dev.parent = &dev->protocol->dev;
         dev->dev.bus = &pnp_bus_type;
         dev->dev.dma_mask = &dev->dma_mask;
-        dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
+        dev->dev.coherent_dma_mask = dev->dma_mask;
         dev->dev.release = &pnp_release_device;
+
+        sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
+                dev->number);
+
+        dev_id = pnp_add_id(dev, pnpid);
+        if (!dev_id) {
+                kfree(dev->res);
+                kfree(dev);
+                return NULL;
+        }
+
+        return dev;
+}
+
+int __pnp_add_device(struct pnp_dev *dev)
+{
+        int ret;
+
+        pnp_fixup_device(dev);
         dev->status = PNP_READY;
         spin_lock(&pnp_lock);
         list_add_tail(&dev->global_list, &pnp_global);
@@ -145,9 +180,6 @@ int pnp_add_device(struct pnp_dev *dev)
         if (dev->card)
                 return -EINVAL;
 
-        dev->dev.parent = &dev->protocol->dev;
-        sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
-                dev->number);
         ret = __pnp_add_device(dev);
         if (ret)
                 return ret;
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index e85cbf116db1..d3f869ee1d92 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -226,22 +226,36 @@ void pnp_unregister_driver(struct pnp_driver *drv)
 
 /**
  * pnp_add_id - adds an EISA id to the specified device
- * @id: pointer to a pnp_id structure
  * @dev: pointer to the desired device
+ * @id: pointer to an EISA id string
  */
-int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
+struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id)
 {
-        struct pnp_id *ptr;
+        struct pnp_id *dev_id, *ptr;
 
-        id->next = NULL;
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        if (!dev_id)
+                return NULL;
+
+        dev_id->id[0] = id[0];
+        dev_id->id[1] = id[1];
+        dev_id->id[2] = id[2];
+        dev_id->id[3] = tolower(id[3]);
+        dev_id->id[4] = tolower(id[4]);
+        dev_id->id[5] = tolower(id[5]);
+        dev_id->id[6] = tolower(id[6]);
+        dev_id->id[7] = '\0';
+
+        dev_id->next = NULL;
         ptr = dev->id;
         while (ptr && ptr->next)
                 ptr = ptr->next;
         if (ptr)
-                ptr->next = id;
+                ptr->next = dev_id;
         else
-                dev->id = id;
-        return 0;
+                dev->id = dev_id;
+
+        return dev_id;
 }
 
 EXPORT_SYMBOL(pnp_register_driver);
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 982658477a58..5d9301de1778 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -248,6 +248,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
                                           char *buf)
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
+        struct resource *res;
         int i, ret;
         pnp_info_buffer_t *buffer;
 
@@ -267,50 +268,46 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
         else
                 pnp_printf(buffer, "disabled\n");
 
-        for (i = 0; i < PNP_MAX_PORT; i++) {
-                if (pnp_port_valid(dev, i)) {
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+                if (pnp_resource_valid(res)) {
                         pnp_printf(buffer, "io");
-                        if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED)
+                        if (res->flags & IORESOURCE_DISABLED)
                                 pnp_printf(buffer, " disabled\n");
                         else
                                 pnp_printf(buffer, " 0x%llx-0x%llx\n",
-                                           (unsigned long long)
-                                           pnp_port_start(dev, i),
-                                           (unsigned long long)pnp_port_end(dev,
-                                                                            i));
+                                           (unsigned long long) res->start,
+                                           (unsigned long long) res->end);
                 }
         }
-        for (i = 0; i < PNP_MAX_MEM; i++) {
-                if (pnp_mem_valid(dev, i)) {
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
+                if (pnp_resource_valid(res)) {
                         pnp_printf(buffer, "mem");
-                        if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED)
+                        if (res->flags & IORESOURCE_DISABLED)
                                 pnp_printf(buffer, " disabled\n");
                         else
                                 pnp_printf(buffer, " 0x%llx-0x%llx\n",
-                                           (unsigned long long)
-                                           pnp_mem_start(dev, i),
-                                           (unsigned long long)pnp_mem_end(dev,
-                                                                           i));
+                                           (unsigned long long) res->start,
+                                           (unsigned long long) res->end);
                 }
         }
-        for (i = 0; i < PNP_MAX_IRQ; i++) {
-                if (pnp_irq_valid(dev, i)) {
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) {
+                if (pnp_resource_valid(res)) {
                         pnp_printf(buffer, "irq");
-                        if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED)
+                        if (res->flags & IORESOURCE_DISABLED)
                                 pnp_printf(buffer, " disabled\n");
                         else
                                 pnp_printf(buffer, " %lld\n",
-                                           (unsigned long long)pnp_irq(dev, i));
+                                           (unsigned long long) res->start);
                 }
         }
-        for (i = 0; i < PNP_MAX_DMA; i++) {
-                if (pnp_dma_valid(dev, i)) {
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) {
+                if (pnp_resource_valid(res)) {
                         pnp_printf(buffer, "dma");
-                        if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED)
+                        if (res->flags & IORESOURCE_DISABLED)
                                 pnp_printf(buffer, " disabled\n");
                         else
                                 pnp_printf(buffer, " %lld\n",
-                                           (unsigned long long)pnp_dma(dev, i));
+                                           (unsigned long long) res->start);
                 }
         }
         ret = (buffer->curr - buf);
@@ -323,8 +320,10 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                           const char *ubuf, size_t count)
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
+        struct pnp_resource *pnp_res;
         char *buf = (void *)ubuf;
         int retval = 0;
+        resource_size_t start, end;
 
         if (dev->status & PNP_ATTACHED) {
                 retval = -EBUSY;
@@ -351,20 +350,20 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
         if (!strnicmp(buf, "auto", 4)) {
                 if (dev->active)
                         goto done;
-                pnp_init_resource_table(&dev->res);
+                pnp_init_resources(dev);
                 retval = pnp_auto_config_dev(dev);
                 goto done;
         }
         if (!strnicmp(buf, "clear", 5)) {
                 if (dev->active)
                         goto done;
-                pnp_init_resource_table(&dev->res);
+                pnp_init_resources(dev);
                 goto done;
         }
         if (!strnicmp(buf, "get", 3)) {
                 mutex_lock(&pnp_res_mutex);
                 if (pnp_can_read(dev))
-                        dev->protocol->get(dev, &dev->res);
+                        dev->protocol->get(dev);
                 mutex_unlock(&pnp_res_mutex);
                 goto done;
         }
@@ -373,7 +372,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                 if (dev->active)
                         goto done;
                 buf += 3;
-                pnp_init_resource_table(&dev->res);
+                pnp_init_resources(dev);
                 mutex_lock(&pnp_res_mutex);
                 while (1) {
                         while (isspace(*buf))
@@ -382,76 +381,60 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                                 buf += 2;
                                 while (isspace(*buf))
                                         ++buf;
-                                dev->res.port_resource[nport].start =
-                                    simple_strtoul(buf, &buf, 0);
+                                start = simple_strtoul(buf, &buf, 0);
                                 while (isspace(*buf))
                                         ++buf;
                                 if (*buf == '-') {
                                         buf += 1;
                                         while (isspace(*buf))
                                                 ++buf;
-                                        dev->res.port_resource[nport].end =
-                                            simple_strtoul(buf, &buf, 0);
+                                        end = simple_strtoul(buf, &buf, 0);
                                 } else
-                                        dev->res.port_resource[nport].end =
-                                            dev->res.port_resource[nport].start;
-                                dev->res.port_resource[nport].flags =
-                                    IORESOURCE_IO;
-                                nport++;
-                                if (nport >= PNP_MAX_PORT)
-                                        break;
+                                        end = start;
+                                pnp_res = pnp_add_io_resource(dev, start, end,
+                                                              0);
+                                if (pnp_res)
+                                        pnp_res->index = nport++;
                                 continue;
                         }
                         if (!strnicmp(buf, "mem", 3)) {
                                 buf += 3;
                                 while (isspace(*buf))
                                         ++buf;
-                                dev->res.mem_resource[nmem].start =
-                                    simple_strtoul(buf, &buf, 0);
+                                start = simple_strtoul(buf, &buf, 0);
                                 while (isspace(*buf))
                                         ++buf;
                                 if (*buf == '-') {
                                         buf += 1;
                                         while (isspace(*buf))
                                                 ++buf;
-                                        dev->res.mem_resource[nmem].end =
-                                            simple_strtoul(buf, &buf, 0);
+                                        end = simple_strtoul(buf, &buf, 0);
                                 } else
-                                        dev->res.mem_resource[nmem].end =
-                                            dev->res.mem_resource[nmem].start;
-                                dev->res.mem_resource[nmem].flags =
-                                    IORESOURCE_MEM;
-                                nmem++;
-                                if (nmem >= PNP_MAX_MEM)
-                                        break;
+                                        end = start;
+                                pnp_res = pnp_add_mem_resource(dev, start, end,
+                                                               0);
+                                if (pnp_res)
+                                        pnp_res->index = nmem++;
                                 continue;
                         }
                         if (!strnicmp(buf, "irq", 3)) {
                                 buf += 3;
                                 while (isspace(*buf))
                                         ++buf;
-                                dev->res.irq_resource[nirq].start =
-                                    dev->res.irq_resource[nirq].end =
-                                    simple_strtoul(buf, &buf, 0);
-                                dev->res.irq_resource[nirq].flags =
-                                    IORESOURCE_IRQ;
-                                nirq++;
-                                if (nirq >= PNP_MAX_IRQ)
-                                        break;
+                                start = simple_strtoul(buf, &buf, 0);
+                                pnp_res = pnp_add_irq_resource(dev, start, 0);
+                                if (pnp_res)
+                                        nirq++;
                                 continue;
                         }
                         if (!strnicmp(buf, "dma", 3)) {
                                 buf += 3;
                                 while (isspace(*buf))
                                         ++buf;
-                                dev->res.dma_resource[ndma].start =
-                                    dev->res.dma_resource[ndma].end =
-                                    simple_strtoul(buf, &buf, 0);
-                                dev->res.dma_resource[ndma].flags =
-                                    IORESOURCE_DMA;
-                                ndma++;
-                                if (ndma >= PNP_MAX_DMA)
-                                        break;
+                                start = simple_strtoul(buf, &buf, 0);
+                                pnp_res = pnp_add_dma_resource(dev, start, 0);
+                                if (pnp_res)
+                                        pnp_res->index = ndma++;
                                 continue;
                         }
                         break;
diff --git a/drivers/pnp/isapnp/Makefile b/drivers/pnp/isapnp/Makefile
index cac18bbfb817..3e38f06f8d78 100644
--- a/drivers/pnp/isapnp/Makefile
+++ b/drivers/pnp/isapnp/Makefile
@@ -5,3 +5,7 @@
 isapnp-proc-$(CONFIG_PROC_FS) = proc.o
 
 obj-y := core.o compat.o $(isapnp-proc-y)
+
+ifeq ($(CONFIG_PNP_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 257f5d827d83..f1bccdbdeb08 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -44,6 +44,8 @@
 #include <linux/mutex.h>
 #include <asm/io.h>
 
+#include "../base.h"
+
 #if 0
 #define ISAPNP_REGION_OK
 #endif
@@ -88,6 +90,14 @@ MODULE_LICENSE("GPL");
 #define _LTAG_MEM32RANGE        0x85
 #define _LTAG_FIXEDMEM32RANGE   0x86
 
+/* Logical device control and configuration registers */
+
+#define ISAPNP_CFG_ACTIVATE     0x30    /* byte */
+#define ISAPNP_CFG_MEM          0x40    /* 4 * dword */
+#define ISAPNP_CFG_PORT         0x60    /* 8 * word */
+#define ISAPNP_CFG_IRQ          0x70    /* 2 * word */
+#define ISAPNP_CFG_DMA          0x74    /* 2 * byte */
+
 /*
  * Sizes of ISAPNP logical device configuration register sets.
  * See PNP-ISA-v1.0a.pdf, Appendix A.
@@ -388,28 +398,6 @@ static void __init isapnp_skip_bytes(int count)
 }
 
 /*
- *  Parse EISA id.
- */
-static void isapnp_parse_id(struct pnp_dev *dev, unsigned short vendor,
-                            unsigned short device)
-{
-        struct pnp_id *id;
-
-        if (!dev)
-                return;
-        id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
-        if (!id)
-                return;
-        sprintf(id->id, "%c%c%c%x%x%x%x",
-                'A' + ((vendor >> 2) & 0x3f) - 1,
-                'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
-                'A' + ((vendor >> 8) & 0x1f) - 1,
-                (device >> 4) & 0x0f,
-                device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);
-        pnp_add_id(id, dev);
-}
-
-/*
  *  Parse logical device tag.
  */
 static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
@@ -417,30 +405,31 @@ static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
 {
         unsigned char tmp[6];
         struct pnp_dev *dev;
+        u32 eisa_id;
+        char id[8];
 
         isapnp_peek(tmp, size);
-        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        eisa_id = tmp[0] | tmp[1] << 8 | tmp[2] << 16 | tmp[3] << 24;
+        pnp_eisa_id_to_string(eisa_id, id);
+
+        dev = pnp_alloc_dev(&isapnp_protocol, number, id);
         if (!dev)
                 return NULL;
-        dev->number = number;
-        isapnp_parse_id(dev, (tmp[1] << 8) | tmp[0], (tmp[3] << 8) | tmp[2]);
-        dev->regs = tmp[4];
+
         dev->card = card;
-        if (size > 5)
-                dev->regs |= tmp[5] << 8;
-        dev->protocol = &isapnp_protocol;
         dev->capabilities |= PNP_CONFIGURABLE;
         dev->capabilities |= PNP_READ;
         dev->capabilities |= PNP_WRITE;
         dev->capabilities |= PNP_DISABLE;
-        pnp_init_resource_table(&dev->res);
+        pnp_init_resources(dev);
         return dev;
 }
 
 /*
  *  Add IRQ resource to resources list.
  */
-static void __init isapnp_parse_irq_resource(struct pnp_option *option,
+static void __init isapnp_parse_irq_resource(struct pnp_dev *dev,
+                                             struct pnp_option *option,
                                              int size)
 {
         unsigned char tmp[3];
@@ -457,13 +446,14 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
                 irq->flags = tmp[2];
         else
                 irq->flags = IORESOURCE_IRQ_HIGHEDGE;
-        pnp_register_irq_resource(option, irq);
+        pnp_register_irq_resource(dev, option, irq);
 }
 
 /*
  *  Add DMA resource to resources list.
  */
-static void __init isapnp_parse_dma_resource(struct pnp_option *option,
+static void __init isapnp_parse_dma_resource(struct pnp_dev *dev,
+                                             struct pnp_option *option,
                                              int size)
 {
         unsigned char tmp[2];
@@ -475,13 +465,14 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
                 return;
         dma->map = tmp[0];
         dma->flags = tmp[1];
-        pnp_register_dma_resource(option, dma);
+        pnp_register_dma_resource(dev, option, dma);
 }
 
 /*
  *  Add port resource to resources list.
  */
-static void __init isapnp_parse_port_resource(struct pnp_option *option,
+static void __init isapnp_parse_port_resource(struct pnp_dev *dev,
+                                              struct pnp_option *option,
                                               int size)
 {
         unsigned char tmp[7];
@@ -496,13 +487,14 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
         port->align = tmp[5];
         port->size = tmp[6];
         port->flags = tmp[0] ? PNP_PORT_FLAG_16BITADDR : 0;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
 /*
  *  Add fixed port resource to resources list.
  */
-static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
+static void __init isapnp_parse_fixed_port_resource(struct pnp_dev *dev,
+                                                    struct pnp_option *option,
                                                     int size)
 {
         unsigned char tmp[3];
@@ -516,13 +508,14 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
         port->size = tmp[2];
         port->align = 0;
         port->flags = PNP_PORT_FLAG_FIXED;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
 /*
  *  Add memory resource to resources list.
  */
-static void __init isapnp_parse_mem_resource(struct pnp_option *option,
+static void __init isapnp_parse_mem_resource(struct pnp_dev *dev,
+                                             struct pnp_option *option,
                                              int size)
 {
         unsigned char tmp[9];
@@ -537,13 +530,14 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
         mem->align = (tmp[6] << 8) | tmp[5];
         mem->size = ((tmp[8] << 8) | tmp[7]) << 8;
         mem->flags = tmp[0];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
 /*
  *  Add 32-bit memory resource to resources list.
  */
-static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
+static void __init isapnp_parse_mem32_resource(struct pnp_dev *dev,
+                                               struct pnp_option *option,
                                                int size)
 {
         unsigned char tmp[17];
@@ -560,13 +554,14 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
         mem->size =
             (tmp[16] << 24) | (tmp[15] << 16) | (tmp[14] << 8) | tmp[13];
         mem->flags = tmp[0];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
 /*
  *  Add 32-bit fixed memory resource to resources list.
  */
-static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
+static void __init isapnp_parse_fixed_mem32_resource(struct pnp_dev *dev,
+                                                     struct pnp_option *option,
                                                      int size)
 {
         unsigned char tmp[9];
@@ -581,7 +576,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
         mem->size = (tmp[8] << 24) | (tmp[7] << 16) | (tmp[6] << 8) | tmp[5];
         mem->align = 0;
         mem->flags = tmp[0];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
 /*
@@ -613,6 +608,8 @@ static int __init isapnp_create_device(struct pnp_card *card,
         unsigned char type, tmp[17];
         struct pnp_option *option;
         struct pnp_dev *dev;
+        u32 eisa_id;
+        char id[8];
 
         if ((dev = isapnp_parse_device(card, size, number++)) == NULL)
                 return 1;
@@ -652,8 +649,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
                 case _STAG_COMPATDEVID:
                         if (size == 4 && compat < DEVICE_COUNT_COMPATIBLE) {
                                 isapnp_peek(tmp, 4);
-                                isapnp_parse_id(dev, (tmp[1] << 8) | tmp[0],
-                                                (tmp[3] << 8) | tmp[2]);
+                                eisa_id = tmp[0] | tmp[1] << 8 |
+                                          tmp[2] << 16 | tmp[3] << 24;
+                                pnp_eisa_id_to_string(eisa_id, id);
+                                pnp_add_id(dev, id);
                                 compat++;
                                 size = 0;
                         }
@@ -661,13 +660,13 @@ static int __init isapnp_create_device(struct pnp_card *card,
                 case _STAG_IRQ:
                         if (size < 2 || size > 3)
                                 goto __skip;
-                        isapnp_parse_irq_resource(option, size);
+                        isapnp_parse_irq_resource(dev, option, size);
                         size = 0;
                         break;
                 case _STAG_DMA:
                         if (size != 2)
                                 goto __skip;
-                        isapnp_parse_dma_resource(option, size);
+                        isapnp_parse_dma_resource(dev, option, size);
                         size = 0;
                         break;
                 case _STAG_STARTDEP:
@@ -687,17 +686,18 @@ static int __init isapnp_create_device(struct pnp_card *card,
                         if (size != 0)
                                 goto __skip;
                         priority = 0;
+                        dev_dbg(&dev->dev, "end dependent options\n");
                         break;
                 case _STAG_IOPORT:
                         if (size != 7)
                                 goto __skip;
-                        isapnp_parse_port_resource(option, size);
+                        isapnp_parse_port_resource(dev, option, size);
                         size = 0;
                         break;
                 case _STAG_FIXEDIO:
                         if (size != 3)
                                 goto __skip;
-                        isapnp_parse_fixed_port_resource(option, size);
+                        isapnp_parse_fixed_port_resource(dev, option, size);
                         size = 0;
                         break;
                 case _STAG_VENDOR:
@@ -705,7 +705,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                 case _LTAG_MEMRANGE:
                         if (size != 9)
                                 goto __skip;
-                        isapnp_parse_mem_resource(option, size);
+                        isapnp_parse_mem_resource(dev, option, size);
                         size = 0;
                         break;
                 case _LTAG_ANSISTR:
@@ -720,13 +720,13 @@ static int __init isapnp_create_device(struct pnp_card *card,
                 case _LTAG_MEM32RANGE:
                         if (size != 17)
                                 goto __skip;
-                        isapnp_parse_mem32_resource(option, size);
+                        isapnp_parse_mem32_resource(dev, option, size);
                         size = 0;
                         break;
                 case _LTAG_FIXEDMEM32RANGE:
                         if (size != 9)
                                 goto __skip;
-                        isapnp_parse_fixed_mem32_resource(option, size);
+                        isapnp_parse_fixed_mem32_resource(dev, option, size);
                         size = 0;
                         break;
                 case _STAG_END:
@@ -734,9 +734,8 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                 isapnp_skip_bytes(size);
                         return 1;
                 default:
-                        printk(KERN_ERR
-                               "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
-                               type, dev->number, card->number);
+                        dev_err(&dev->dev, "unknown tag %#x (card %i), "
+                                "ignored\n", type, card->number);
                 }
 __skip:
                 if (size > 0)
@@ -789,9 +788,8 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                                 isapnp_skip_bytes(size);
                         return;
                 default:
-                        printk(KERN_ERR
-                               "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
-                               type, card->number);
+                        dev_err(&card->dev, "unknown tag %#x, ignored\n",
+                               type);
                 }
 __skip:
                 if (size > 0)
@@ -822,25 +820,6 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
 }
 
 /*
- *  Parse EISA id for ISA PnP card.
- */
-static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor,
-                                 unsigned short device)
-{
-        struct pnp_id *id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
-
-        if (!id)
-                return;
-        sprintf(id->id, "%c%c%c%x%x%x%x",
-                'A' + ((vendor >> 2) & 0x3f) - 1,
-                'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
-                'A' + ((vendor >> 8) & 0x1f) - 1,
-                (device >> 4) & 0x0f,
-                device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);
-        pnp_add_card_id(id, card);
-}
-
-/*
  *  Build device list for all present ISA PnP devices.
  */
 static int __init isapnp_build_device_list(void)
@@ -848,6 +827,8 @@ static int __init isapnp_build_device_list(void)
         int csn;
         unsigned char header[9], checksum;
         struct pnp_card *card;
+        u32 eisa_id;
+        char id[8];
 
         isapnp_wait();
         isapnp_key();
@@ -855,32 +836,30 @@ static int __init isapnp_build_device_list(void)
                 isapnp_wake(csn);
                 isapnp_peek(header, 9);
                 checksum = isapnp_checksum(header);
+                eisa_id = header[0] | header[1] << 8 |
+                          header[2] << 16 | header[3] << 24;
+                pnp_eisa_id_to_string(eisa_id, id);
+                card = pnp_alloc_card(&isapnp_protocol, csn, id);
+                if (!card)
+                        continue;
+
 #if 0
-                printk(KERN_DEBUG
+                dev_info(&card->dev,
                        "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
                        header[0], header[1], header[2], header[3], header[4],
                        header[5], header[6], header[7], header[8]);
-                printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
+                dev_info(&card->dev, "checksum = %#x\n", checksum);
 #endif
-                if ((card =
-                     kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
-                        continue;
-
-                card->number = csn;
                 INIT_LIST_HEAD(&card->devices);
-                isapnp_parse_card_id(card, (header[1] << 8) | header[0],
-                                     (header[3] << 8) | header[2]);
                 card->serial =
                     (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
                     header[4];
                 isapnp_checksum_value = 0x00;
                 isapnp_parse_resource_map(card);
                 if (isapnp_checksum_value != 0x00)
-                        printk(KERN_ERR
-                               "isapnp: checksum for device %i is not valid (0x%x)\n",
-                               csn, isapnp_checksum_value);
+                        dev_err(&card->dev, "invalid checksum %#x\n",
+                                isapnp_checksum_value);
                 card->checksum = isapnp_checksum_value;
-                card->protocol = &isapnp_protocol;
 
                 pnp_add_card(card);
         }
@@ -947,100 +926,117 @@ EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
 EXPORT_SYMBOL(isapnp_write_byte);
 
-static int isapnp_read_resources(struct pnp_dev *dev,
-                                 struct pnp_resource_table *res)
+static int isapnp_get_resources(struct pnp_dev *dev)
 {
-        int tmp, ret;
+        struct pnp_resource *pnp_res;
+        int i, ret;
 
+        dev_dbg(&dev->dev, "get resources\n");
+        pnp_init_resources(dev);
+        isapnp_cfg_begin(dev->card->number, dev->number);
         dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
-        if (dev->active) {
-                for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
-                        ret = isapnp_read_word(ISAPNP_CFG_PORT + (tmp << 1));
-                        if (!ret)
-                                continue;
-                        res->port_resource[tmp].start = ret;
-                        res->port_resource[tmp].flags = IORESOURCE_IO;
+        if (!dev->active)
+                goto __end;
+
+        for (i = 0; i < ISAPNP_MAX_PORT; i++) {
+                ret = isapnp_read_word(ISAPNP_CFG_PORT + (i << 1));
+                if (ret) {
+                        pnp_res = pnp_add_io_resource(dev, ret, ret, 0);
+                        if (pnp_res)
+                                pnp_res->index = i;
                 }
-                for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
-                        ret =
-                            isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
-                        if (!ret)
-                                continue;
-                        res->mem_resource[tmp].start = ret;
-                        res->mem_resource[tmp].flags = IORESOURCE_MEM;
+        }
+        for (i = 0; i < ISAPNP_MAX_MEM; i++) {
+                ret = isapnp_read_word(ISAPNP_CFG_MEM + (i << 3)) << 8;
+                if (ret) {
+                        pnp_res = pnp_add_mem_resource(dev, ret, ret, 0);
+                        if (pnp_res)
+                                pnp_res->index = i;
                 }
-                for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
-                        ret =
-                            (isapnp_read_word(ISAPNP_CFG_IRQ + (tmp << 1)) >>
-                             8);
-                        if (!ret)
-                                continue;
-                        res->irq_resource[tmp].start =
-                            res->irq_resource[tmp].end = ret;
-                        res->irq_resource[tmp].flags = IORESOURCE_IRQ;
+        }
+        for (i = 0; i < ISAPNP_MAX_IRQ; i++) {
+                ret = isapnp_read_word(ISAPNP_CFG_IRQ + (i << 1)) >> 8;
+                if (ret) {
+                        pnp_res = pnp_add_irq_resource(dev, ret, 0);
+                        if (pnp_res)
+                                pnp_res->index = i;
                 }
-                for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
-                        ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
-                        if (ret == 4)
-                                continue;
-                        res->dma_resource[tmp].start =
-                            res->dma_resource[tmp].end = ret;
-                        res->dma_resource[tmp].flags = IORESOURCE_DMA;
+        }
+        for (i = 0; i < ISAPNP_MAX_DMA; i++) {
+                ret = isapnp_read_byte(ISAPNP_CFG_DMA + i);
+                if (ret != 4) {
+                        pnp_res = pnp_add_dma_resource(dev, ret, 0);
+                        if  (pnp_res)
+                                pnp_res->index = i;
                 }
         }
-        return 0;
-}
-
-static int isapnp_get_resources(struct pnp_dev *dev,
-                                struct pnp_resource_table *res)
-{
-        int ret;
 
-        pnp_init_resource_table(res);
-        isapnp_cfg_begin(dev->card->number, dev->number);
-        ret = isapnp_read_resources(dev, res);
+__end:
         isapnp_cfg_end();
-        return ret;
+        return 0;
 }
 
-static int isapnp_set_resources(struct pnp_dev *dev,
-                                struct pnp_resource_table *res)
+static int isapnp_set_resources(struct pnp_dev *dev)
 {
-        int tmp;
+        struct pnp_resource *pnp_res;
+        struct resource *res;
+        int tmp, index;
 
+        dev_dbg(&dev->dev, "set resources\n");
         isapnp_cfg_begin(dev->card->number, dev->number);
         dev->active = 1;
-        for (tmp = 0;
-             tmp < ISAPNP_MAX_PORT
-             && (res->port_resource[tmp].
-                 flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO;
-             tmp++)
-                isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
-                                  res->port_resource[tmp].start);
-        for (tmp = 0;
-             tmp < ISAPNP_MAX_IRQ
-             && (res->irq_resource[tmp].
-                 flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ;
-             tmp++) {
-                int irq = res->irq_resource[tmp].start;
-                if (irq == 2)
-                        irq = 9;
-                isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq);
+        for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
+                pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, tmp);
+                if (!pnp_res)
+                        continue;
+                res = &pnp_res->res;
+                if (pnp_resource_valid(res)) {
+                        index = pnp_res->index;
+                        dev_dbg(&dev->dev, "  set io  %d to %#llx\n",
+                                index, (unsigned long long) res->start);
+                        isapnp_write_word(ISAPNP_CFG_PORT + (index << 1),
+                                          res->start);
+                }
+        }
+        for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
+                pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, tmp);
+                if (!pnp_res)
+                        continue;
+                res = &pnp_res->res;
+                if (pnp_resource_valid(res)) {
+                        int irq = res->start;
+                        if (irq == 2)
+                                irq = 9;
+                        index = pnp_res->index;
+                        dev_dbg(&dev->dev, "  set irq %d to %d\n", index, irq);
+                        isapnp_write_byte(ISAPNP_CFG_IRQ + (index << 1), irq);
+                }
+        }
+        for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
+                pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, tmp);
+                if (!pnp_res)
+                        continue;
+                res = &pnp_res->res;
+                if (pnp_resource_valid(res)) {
+                        index = pnp_res->index;
+                        dev_dbg(&dev->dev, "  set dma %d to %lld\n",
+                                index, (unsigned long long) res->start);
+                        isapnp_write_byte(ISAPNP_CFG_DMA + index, res->start);
+                }
+        }
+        for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
+                pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, tmp);
+                if (!pnp_res)
+                        continue;
+                res = &pnp_res->res;
+                if (pnp_resource_valid(res)) {
+                        index = pnp_res->index;
+                        dev_dbg(&dev->dev, "  set mem %d to %#llx\n",
+                                index, (unsigned long long) res->start);
+                        isapnp_write_word(ISAPNP_CFG_MEM + (index << 3),
+                                          (res->start >> 8) & 0xffff);
+                }
         }
-        for (tmp = 0;
-             tmp < ISAPNP_MAX_DMA
-             && (res->dma_resource[tmp].
-                 flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA;
-             tmp++)
-                isapnp_write_byte(ISAPNP_CFG_DMA + tmp,
-                                  res->dma_resource[tmp].start);
-        for (tmp = 0;
-             tmp < ISAPNP_MAX_MEM
-             && (res->mem_resource[tmp].
-                 flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM;
-             tmp++)
-                isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3),
-                                  (res->mem_resource[tmp].start >> 8) & 0xffff);
         /* FIXME: We aren't handling 32bit mems properly here */
         isapnp_activate(dev->number);
         isapnp_cfg_end();
@@ -1138,13 +1134,13 @@ static int __init isapnp_init(void)
         protocol_for_each_card(&isapnp_protocol, card) {
                 cards++;
                 if (isapnp_verbose) {
-                        printk(KERN_INFO "isapnp: Card '%s'\n",
-                               card->name[0] ? card->name : "Unknown");
+                        dev_info(&card->dev, "card '%s'\n",
+                               card->name[0] ? card->name : "unknown");
                         if (isapnp_verbose < 2)
                                 continue;
                         card_for_each_dev(card, dev) {
-                                printk(KERN_INFO "isapnp:   Device '%s'\n",
-                                       dev->name[0] ? dev->name : "Unknown");
+                                dev_info(&card->dev, "device '%s'\n",
+                                       dev->name[0] ? dev->name : "unknown");
                         }
                 }
         }
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index c28caf272c11..bea0914ff947 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -19,100 +19,118 @@ DEFINE_MUTEX(pnp_res_mutex);
 
 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 {
-        resource_size_t *start, *end;
-        unsigned long *flags;
+        struct pnp_resource *pnp_res;
+        struct resource *res;
 
-        if (idx >= PNP_MAX_PORT) {
+        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, idx);
+        if (!pnp_res) {
                 dev_err(&dev->dev, "too many I/O port resources\n");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
 
+        res = &pnp_res->res;
+
         /* check if this resource has been manually set, if so skip */
-        if (!(dev->res.port_resource[idx].flags & IORESOURCE_AUTO))
+        if (!(res->flags & IORESOURCE_AUTO)) {
+                dev_dbg(&dev->dev, "  io %d already set to %#llx-%#llx "
+                        "flags %#lx\n", idx, (unsigned long long) res->start,
+                        (unsigned long long) res->end, res->flags);
                 return 1;
-
-        start = &dev->res.port_resource[idx].start;
-        end = &dev->res.port_resource[idx].end;
-        flags = &dev->res.port_resource[idx].flags;
+        }
 
         /* set the initial values */
-        *flags |= rule->flags | IORESOURCE_IO;
-        *flags &= ~IORESOURCE_UNSET;
+        pnp_res->index = idx;
+        res->flags |= rule->flags | IORESOURCE_IO;
+        res->flags &= ~IORESOURCE_UNSET;
 
         if (!rule->size) {
-                *flags |= IORESOURCE_DISABLED;
+                res->flags |= IORESOURCE_DISABLED;
+                dev_dbg(&dev->dev, "  io %d disabled\n", idx);
                 return 1;       /* skip disabled resource requests */
         }
 
-        *start = rule->min;
-        *end = *start + rule->size - 1;
+        res->start = rule->min;
+        res->end = res->start + rule->size - 1;
 
         /* run through until pnp_check_port is happy */
-        while (!pnp_check_port(dev, idx)) {
-                *start += rule->align;
-                *end = *start + rule->size - 1;
-                if (*start > rule->max || !rule->align)
+        while (!pnp_check_port(dev, res)) {
+                res->start += rule->align;
+                res->end = res->start + rule->size - 1;
+                if (res->start > rule->max || !rule->align) {
+                        dev_dbg(&dev->dev, "  couldn't assign io %d\n", idx);
                         return 0;
+                }
         }
+        dev_dbg(&dev->dev, "  assign io  %d %#llx-%#llx\n", idx,
+                (unsigned long long) res->start, (unsigned long long) res->end);
         return 1;
 }
 
 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 {
-        resource_size_t *start, *end;
-        unsigned long *flags;
+        struct pnp_resource *pnp_res;
+        struct resource *res;
 
-        if (idx >= PNP_MAX_MEM) {
+        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, idx);
+        if (!pnp_res) {
                 dev_err(&dev->dev, "too many memory resources\n");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
 
+        res = &pnp_res->res;
+
         /* check if this resource has been manually set, if so skip */
-        if (!(dev->res.mem_resource[idx].flags & IORESOURCE_AUTO))
+        if (!(res->flags & IORESOURCE_AUTO)) {
+                dev_dbg(&dev->dev, "  mem %d already set to %#llx-%#llx "
+                        "flags %#lx\n", idx, (unsigned long long) res->start,
+                        (unsigned long long) res->end, res->flags);
                 return 1;
-
-        start = &dev->res.mem_resource[idx].start;
-        end = &dev->res.mem_resource[idx].end;
-        flags = &dev->res.mem_resource[idx].flags;
+        }
 
         /* set the initial values */
-        *flags |= rule->flags | IORESOURCE_MEM;
-        *flags &= ~IORESOURCE_UNSET;
+        pnp_res->index = idx;
+        res->flags |= rule->flags | IORESOURCE_MEM;
+        res->flags &= ~IORESOURCE_UNSET;
 
         /* convert pnp flags to standard Linux flags */
         if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
-                *flags |= IORESOURCE_READONLY;
+                res->flags |= IORESOURCE_READONLY;
         if (rule->flags & IORESOURCE_MEM_CACHEABLE)
-                *flags |= IORESOURCE_CACHEABLE;
+                res->flags |= IORESOURCE_CACHEABLE;
         if (rule->flags & IORESOURCE_MEM_RANGELENGTH)
-                *flags |= IORESOURCE_RANGELENGTH;
+                res->flags |= IORESOURCE_RANGELENGTH;
         if (rule->flags & IORESOURCE_MEM_SHADOWABLE)
-                *flags |= IORESOURCE_SHADOWABLE;
+                res->flags |= IORESOURCE_SHADOWABLE;
 
         if (!rule->size) {
-                *flags |= IORESOURCE_DISABLED;
+                res->flags |= IORESOURCE_DISABLED;
+                dev_dbg(&dev->dev, "  mem %d disabled\n", idx);
                 return 1;       /* skip disabled resource requests */
         }
 
-        *start = rule->min;
-        *end = *start + rule->size - 1;
+        res->start = rule->min;
+        res->end = res->start + rule->size - 1;
 
         /* run through until pnp_check_mem is happy */
-        while (!pnp_check_mem(dev, idx)) {
-                *start += rule->align;
-                *end = *start + rule->size - 1;
-                if (*start > rule->max || !rule->align)
+        while (!pnp_check_mem(dev, res)) {
+                res->start += rule->align;
+                res->end = res->start + rule->size - 1;
+                if (res->start > rule->max || !rule->align) {
+                        dev_dbg(&dev->dev, "  couldn't assign mem %d\n", idx);
                         return 0;
+                }
         }
+        dev_dbg(&dev->dev, "  assign mem %d %#llx-%#llx\n", idx,
+                (unsigned long long) res->start, (unsigned long long) res->end);
         return 1;
 }
 
 static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 {
-        resource_size_t *start, *end;
-        unsigned long *flags;
+        struct pnp_resource *pnp_res;
+        struct resource *res;
         int i;
 
         /* IRQ priority: this table is good for i386 */
@@ -120,49 +138,59 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
         };
 
-        if (idx >= PNP_MAX_IRQ) {
+        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, idx);
+        if (!pnp_res) {
                 dev_err(&dev->dev, "too many IRQ resources\n");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
 
+        res = &pnp_res->res;
+
         /* check if this resource has been manually set, if so skip */
-        if (!(dev->res.irq_resource[idx].flags & IORESOURCE_AUTO))
+        if (!(res->flags & IORESOURCE_AUTO)) {
+                dev_dbg(&dev->dev, "  irq %d already set to %d flags %#lx\n",
+                        idx, (int) res->start, res->flags);
                 return 1;
-
-        start = &dev->res.irq_resource[idx].start;
-        end = &dev->res.irq_resource[idx].end;
-        flags = &dev->res.irq_resource[idx].flags;
+        }
 
         /* set the initial values */
-        *flags |= rule->flags | IORESOURCE_IRQ;
-        *flags &= ~IORESOURCE_UNSET;
+        pnp_res->index = idx;
+        res->flags |= rule->flags | IORESOURCE_IRQ;
+        res->flags &= ~IORESOURCE_UNSET;
 
         if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
-                *flags |= IORESOURCE_DISABLED;
+                res->flags |= IORESOURCE_DISABLED;
+                dev_dbg(&dev->dev, "  irq %d disabled\n", idx);
                 return 1;       /* skip disabled resource requests */
         }
 
         /* TBD: need check for >16 IRQ */
-        *start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
-        if (*start < PNP_IRQ_NR) {
-                *end = *start;
+        res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
+        if (res->start < PNP_IRQ_NR) {
+                res->end = res->start;
+                dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
+                        (int) res->start);
                 return 1;
         }
         for (i = 0; i < 16; i++) {
                 if (test_bit(xtab[i], rule->map)) {
-                        *start = *end = xtab[i];
-                        if (pnp_check_irq(dev, idx))
+                        res->start = res->end = xtab[i];
+                        if (pnp_check_irq(dev, res)) {
+                                dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
+                                        (int) res->start);
                                 return 1;
+                        }
                 }
         }
+        dev_dbg(&dev->dev, "  couldn't assign irq %d\n", idx);
         return 0;
 }
 
 static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
-        resource_size_t *start, *end;
-        unsigned long *flags;
+        struct pnp_resource *pnp_res;
+        struct resource *res;
         int i;
 
         /* DMA priority: this table is good for i386 */
@@ -170,71 +198,89 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 1, 3, 5, 6, 7, 0, 2, 4
         };
 
-        if (idx >= PNP_MAX_DMA) {
+        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, idx);
+        if (!pnp_res) {
                 dev_err(&dev->dev, "too many DMA resources\n");
                 return;
         }
 
+        res = &pnp_res->res;
+
         /* check if this resource has been manually set, if so skip */
-        if (!(dev->res.dma_resource[idx].flags & IORESOURCE_AUTO))
+        if (!(res->flags & IORESOURCE_AUTO)) {
+                dev_dbg(&dev->dev, "  dma %d already set to %d flags %#lx\n",
+                        idx, (int) res->start, res->flags);
                 return;
-
-        start = &dev->res.dma_resource[idx].start;
-        end = &dev->res.dma_resource[idx].end;
-        flags = &dev->res.dma_resource[idx].flags;
+        }
 
         /* set the initial values */
-        *flags |= rule->flags | IORESOURCE_DMA;
-        *flags &= ~IORESOURCE_UNSET;
+        pnp_res->index = idx;
+        res->flags |= rule->flags | IORESOURCE_DMA;
+        res->flags &= ~IORESOURCE_UNSET;
 
         for (i = 0; i < 8; i++) {
                 if (rule->map & (1 << xtab[i])) {
-                        *start = *end = xtab[i];
-                        if (pnp_check_dma(dev, idx))
+                        res->start = res->end = xtab[i];
+                        if (pnp_check_dma(dev, res)) {
+                                dev_dbg(&dev->dev, "  assign dma %d %d\n", idx,
+                                        (int) res->start);
                                 return;
+                        }
                 }
         }
 #ifdef MAX_DMA_CHANNELS
-        *start = *end = MAX_DMA_CHANNELS;
+        res->start = res->end = MAX_DMA_CHANNELS;
 #endif
-        *flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+        res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+        dev_dbg(&dev->dev, "  disable dma %d\n", idx);
+}
+
+void pnp_init_resource(struct resource *res)
+{
+        unsigned long type;
+
+        type = res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
+                             IORESOURCE_IRQ | IORESOURCE_DMA);
+
+        res->name = NULL;
+        res->flags = type | IORESOURCE_AUTO | IORESOURCE_UNSET;
+        if (type == IORESOURCE_IRQ || type == IORESOURCE_DMA) {
+                res->start = -1;
+                res->end = -1;
+        } else {
+                res->start = 0;
+                res->end = 0;
+        }
 }
 
 /**
  * pnp_init_resources - Resets a resource table to default values.
  * @table: pointer to the desired resource table
  */
-void pnp_init_resource_table(struct pnp_resource_table *table)
+void pnp_init_resources(struct pnp_dev *dev)
 {
+        struct resource *res;
         int idx;
 
         for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-                table->irq_resource[idx].name = NULL;
-                table->irq_resource[idx].start = -1;
-                table->irq_resource[idx].end = -1;
-                table->irq_resource[idx].flags =
-                    IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->irq[idx].res;
+                res->flags = IORESOURCE_IRQ;
+                pnp_init_resource(res);
         }
         for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-                table->dma_resource[idx].name = NULL;
-                table->dma_resource[idx].start = -1;
-                table->dma_resource[idx].end = -1;
-                table->dma_resource[idx].flags =
-                    IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->dma[idx].res;
+                res->flags = IORESOURCE_DMA;
+                pnp_init_resource(res);
         }
         for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-                table->port_resource[idx].name = NULL;
-                table->port_resource[idx].start = 0;
-                table->port_resource[idx].end = 0;
-                table->port_resource[idx].flags =
-                    IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->port[idx].res;
+                res->flags = IORESOURCE_IO;
+                pnp_init_resource(res);
         }
         for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-                table->mem_resource[idx].name = NULL;
-                table->mem_resource[idx].start = 0;
-                table->mem_resource[idx].end = 0;
-                table->mem_resource[idx].flags =
-                    IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->mem[idx].res;
+                res->flags = IORESOURCE_MEM;
+                pnp_init_resource(res);
         }
 }
 
@@ -242,41 +288,38 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
  * pnp_clean_resources - clears resources that were not manually set
  * @res: the resources to clean
  */
-static void pnp_clean_resource_table(struct pnp_resource_table *res)
+static void pnp_clean_resource_table(struct pnp_dev *dev)
 {
+        struct resource *res;
         int idx;
 
         for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-                if (!(res->irq_resource[idx].flags & IORESOURCE_AUTO))
-                        continue;
-                res->irq_resource[idx].start = -1;
-                res->irq_resource[idx].end = -1;
-                res->irq_resource[idx].flags =
-                    IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->irq[idx].res;
+                if (res->flags & IORESOURCE_AUTO) {
+                        res->flags = IORESOURCE_IRQ;
+                        pnp_init_resource(res);
+                }
         }
         for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-                if (!(res->dma_resource[idx].flags & IORESOURCE_AUTO))
-                        continue;
-                res->dma_resource[idx].start = -1;
-                res->dma_resource[idx].end = -1;
-                res->dma_resource[idx].flags =
-                    IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->dma[idx].res;
+                if (res->flags & IORESOURCE_AUTO) {
+                        res->flags = IORESOURCE_DMA;
+                        pnp_init_resource(res);
+                }
         }
         for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-                if (!(res->port_resource[idx].flags & IORESOURCE_AUTO))
-                        continue;
-                res->port_resource[idx].start = 0;
-                res->port_resource[idx].end = 0;
-                res->port_resource[idx].flags =
-                    IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->port[idx].res;
+                if (res->flags & IORESOURCE_AUTO) {
+                        res->flags = IORESOURCE_IO;
+                        pnp_init_resource(res);
+                }
         }
         for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-                if (!(res->mem_resource[idx].flags & IORESOURCE_AUTO))
-                        continue;
-                res->mem_resource[idx].start = 0;
-                res->mem_resource[idx].end = 0;
-                res->mem_resource[idx].flags =
-                    IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res = &dev->res->mem[idx].res;
+                if (res->flags & IORESOURCE_AUTO) {
+                        res->flags = IORESOURCE_MEM;
+                        pnp_init_resource(res);
+                }
         }
 }
 
@@ -298,9 +341,11 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         if (!pnp_can_configure(dev))
                 return -ENODEV;
 
+        dbg_pnp_show_resources(dev, "before pnp_assign_resources");
         mutex_lock(&pnp_res_mutex);
-        pnp_clean_resource_table(&dev->res);    /* start with a fresh slate */
+        pnp_clean_resource_table(dev);
         if (dev->independent) {
+                dev_dbg(&dev->dev, "assigning independent options\n");
                 port = dev->independent->port;
                 mem = dev->independent->mem;
                 irq = dev->independent->irq;
@@ -333,6 +378,8 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         if (depnum) {
                 struct pnp_option *dep;
                 int i;
+
+                dev_dbg(&dev->dev, "assigning dependent option %d\n", depnum);
                 for (i = 1, dep = dev->dependent; i < depnum;
                      i++, dep = dep->next)
                         if (!dep)
@@ -368,68 +415,17 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                 goto fail;
 
         mutex_unlock(&pnp_res_mutex);
+        dbg_pnp_show_resources(dev, "after pnp_assign_resources");
         return 1;
 
 fail:
-        pnp_clean_resource_table(&dev->res);
+        pnp_clean_resource_table(dev);
         mutex_unlock(&pnp_res_mutex);
+        dbg_pnp_show_resources(dev, "after pnp_assign_resources (failed)");
         return 0;
 }
 
 /**
- * pnp_manual_config_dev - Disables Auto Config and Manually sets the resource table
- * @dev: pointer to the desired device
- * @res: pointer to the new resource config
- * @mode: 0 or PNP_CONFIG_FORCE
- *
- * This function can be used by drivers that want to manually set thier resources.
- */
-int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
-                          int mode)
-{
-        int i;
-        struct pnp_resource_table *bak;
-
-        if (!pnp_can_configure(dev))
-                return -ENODEV;
-        bak = pnp_alloc(sizeof(struct pnp_resource_table));
-        if (!bak)
-                return -ENOMEM;
-        *bak = dev->res;
-
-        mutex_lock(&pnp_res_mutex);
-        dev->res = *res;
-        if (!(mode & PNP_CONFIG_FORCE)) {
-                for (i = 0; i < PNP_MAX_PORT; i++) {
-                        if (!pnp_check_port(dev, i))
-                                goto fail;
-                }
-                for (i = 0; i < PNP_MAX_MEM; i++) {
-                        if (!pnp_check_mem(dev, i))
-                                goto fail;
-                }
-                for (i = 0; i < PNP_MAX_IRQ; i++) {
-                        if (!pnp_check_irq(dev, i))
-                                goto fail;
-                }
-                for (i = 0; i < PNP_MAX_DMA; i++) {
-                        if (!pnp_check_dma(dev, i))
-                                goto fail;
-                }
-        }
-        mutex_unlock(&pnp_res_mutex);
-
-        kfree(bak);
-        return 0;
-
-fail:
-        dev->res = *bak;
-        mutex_unlock(&pnp_res_mutex);
-        kfree(bak);
-        return -EINVAL;
-}
-
-/**
  * pnp_auto_config_dev - automatically assigns resources to a device
  * @dev: pointer to the desired device
  */
@@ -473,7 +469,8 @@ int pnp_start_dev(struct pnp_dev *dev)
                 return -EINVAL;
         }
 
-        if (dev->protocol->set(dev, &dev->res) < 0) {
+        dbg_pnp_show_resources(dev, "pnp_start_dev");
+        if (dev->protocol->set(dev) < 0) {
                 dev_err(&dev->dev, "activation failed\n");
                 return -EIO;
         }
@@ -549,30 +546,13 @@ int pnp_disable_dev(struct pnp_dev *dev)
 
         /* release the resources so that other devices can use them */
         mutex_lock(&pnp_res_mutex);
-        pnp_clean_resource_table(&dev->res);
+        pnp_clean_resource_table(dev);
         mutex_unlock(&pnp_res_mutex);
 
         return 0;
 }
 
-/**
- * pnp_resource_change - change one resource
- * @resource: pointer to resource to be changed
- * @start: start of region
- * @size: size of region
- */
-void pnp_resource_change(struct resource *resource, resource_size_t start,
-                         resource_size_t size)
-{
-        resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
-        resource->start = start;
-        resource->end = start + size - 1;
-}
-
-EXPORT_SYMBOL(pnp_manual_config_dev);
 EXPORT_SYMBOL(pnp_start_dev);
 EXPORT_SYMBOL(pnp_stop_dev);
 EXPORT_SYMBOL(pnp_activate_dev);
 EXPORT_SYMBOL(pnp_disable_dev);
-EXPORT_SYMBOL(pnp_resource_change);
-EXPORT_SYMBOL(pnp_init_resource_table);
diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile
index 905326fcca85..2d7a1e6908be 100644
--- a/drivers/pnp/pnpacpi/Makefile
+++ b/drivers/pnp/pnpacpi/Makefile
@@ -3,3 +3,7 @@
 #
 
 obj-y := core.o rsparser.o
+
+ifeq ($(CONFIG_PNP_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index c283a9a70d83..50902773beaf 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -25,6 +25,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
 
+#include "../base.h"
 #include "pnpacpi.h"
 
 static int num = 0;
@@ -44,7 +45,7 @@ static struct acpi_device_id excluded_id_list[] __initdata = {
         {"", 0},
 };
 
-static inline int is_exclusive_device(struct acpi_device *dev)
+static inline int __init is_exclusive_device(struct acpi_device *dev)
 {
         return (!acpi_match_device_ids(dev, excluded_id_list));
 }
@@ -72,40 +73,24 @@ static int __init ispnpidacpi(char *id)
         return 1;
 }
 
-static void __init pnpidacpi_to_pnpid(char *id, char *str)
+static int pnpacpi_get_resources(struct pnp_dev *dev)
 {
-        str[0] = id[0];
-        str[1] = id[1];
-        str[2] = id[2];
-        str[3] = tolower(id[3]);
-        str[4] = tolower(id[4]);
-        str[5] = tolower(id[5]);
-        str[6] = tolower(id[6]);
-        str[7] = '\0';
+        dev_dbg(&dev->dev, "get resources\n");
+        return pnpacpi_parse_allocated_resource(dev);
 }
 
-static int pnpacpi_get_resources(struct pnp_dev *dev,
-                                 struct pnp_resource_table *res)
-{
-        acpi_status status;
-
-        status = pnpacpi_parse_allocated_resource((acpi_handle) dev->data,
-                                                  &dev->res);
-        return ACPI_FAILURE(status) ? -ENODEV : 0;
-}
-
-static int pnpacpi_set_resources(struct pnp_dev *dev,
-                                 struct pnp_resource_table *res)
+static int pnpacpi_set_resources(struct pnp_dev *dev)
 {
         acpi_handle handle = dev->data;
         struct acpi_buffer buffer;
-        int ret = 0;
+        int ret;
         acpi_status status;
 
-        ret = pnpacpi_build_resource_template(handle, &buffer);
+        dev_dbg(&dev->dev, "set resources\n");
+        ret = pnpacpi_build_resource_template(dev, &buffer);
         if (ret)
                 return ret;
-        ret = pnpacpi_encode_resources(res, &buffer);
+        ret = pnpacpi_encode_resources(dev, &buffer);
         if (ret) {
                 kfree(buffer.pointer);
                 return ret;
@@ -163,7 +148,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 {
         acpi_handle temp = NULL;
         acpi_status status;
-        struct pnp_id *dev_id;
         struct pnp_dev *dev;
 
         status = acpi_get_handle(device->handle, "_CRS", &temp);
@@ -171,11 +155,10 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
             is_exclusive_device(device))
                 return 0;
 
-        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
-        if (!dev) {
-                pnp_err("Out of memory");
+        dev = pnp_alloc_dev(&pnpacpi_protocol, num, acpi_device_hid(device));
+        if (!dev)
                 return -ENOMEM;
-        }
+
         dev->data = device->handle;
         /* .enabled means the device can decode the resources */
         dev->active = device->status.enabled;
@@ -191,44 +174,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         if (ACPI_SUCCESS(status))
                 dev->capabilities |= PNP_DISABLE;
 
-        dev->protocol = &pnpacpi_protocol;
-
         if (strlen(acpi_device_name(device)))
                 strncpy(dev->name, acpi_device_name(device), sizeof(dev->name));
         else
                 strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name));
 
-        dev->number = num;
-
-        /* set the initial values for the PnP device */
-        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
-        if (!dev_id)
-                goto err;
-        pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
-        pnp_add_id(dev_id, dev);
-
-        if (dev->active) {
-                /* parse allocated resource */
-                status = pnpacpi_parse_allocated_resource(device->handle,
-                                                          &dev->res);
-                if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
-                        pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s",
-                                dev_id->id);
-                        goto err1;
-                }
-        }
+        if (dev->active)
+                pnpacpi_parse_allocated_resource(dev);
 
-        if (dev->capabilities & PNP_CONFIGURABLE) {
-                status = pnpacpi_parse_resource_option_data(device->handle,
-                                                            dev);
-                if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
-                        pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s",
-                                dev_id->id);
-                        goto err1;
-                }
-        }
+        if (dev->capabilities & PNP_CONFIGURABLE)
+                pnpacpi_parse_resource_option_data(dev);
 
-        /* parse compatible ids */
         if (device->flags.compatible_ids) {
                 struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
                 int i;
@@ -236,27 +192,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 for (i = 0; i < cid_list->count; i++) {
                         if (!ispnpidacpi(cid_list->id[i].value))
                                 continue;
-                        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
-                        if (!dev_id)
-                                continue;
-
-                        pnpidacpi_to_pnpid(cid_list->id[i].value, dev_id->id);
-                        pnp_add_id(dev_id, dev);
+                        pnp_add_id(dev, cid_list->id[i].value);
                 }
         }
 
         /* clear out the damaged flags */
         if (!dev->active)
-                pnp_init_resource_table(&dev->res);
+                pnp_init_resources(dev);
         pnp_add_device(dev);
         num++;
 
         return AE_OK;
-err1:
-        kfree(dev_id);
-err:
-        kfree(dev);
-        return -EINVAL;
 }
 
 static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h
index f28e2ed66fa3..3e60225b0227 100644
--- a/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/drivers/pnp/pnpacpi/pnpacpi.h
@@ -5,8 +5,8 @@
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 
-acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*);
-acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*);
-int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *);
-int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*);
+int pnpacpi_parse_allocated_resource(struct pnp_dev *);
+int pnpacpi_parse_resource_option_data(struct pnp_dev *);
+int pnpacpi_encode_resources(struct pnp_dev *, struct acpi_buffer *);
+int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *);
 #endif
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 98cbc9f18eed..0201c8adfda7 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -21,6 +21,8 @@
 #include <linux/kernel.h>
 #include <linux/acpi.h>
 #include <linux/pci.h>
+#include <linux/pnp.h>
+#include "../base.h"
 #include "pnpacpi.h"
 
 #ifdef CONFIG_IA64
@@ -32,19 +34,26 @@
 /*
  * Allocated Resources
  */
-static int irq_flags(int triggering, int polarity)
+static int irq_flags(int triggering, int polarity, int shareable)
 {
+        int flags;
+
         if (triggering == ACPI_LEVEL_SENSITIVE) {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        return IORESOURCE_IRQ_LOWLEVEL;
+                        flags = IORESOURCE_IRQ_LOWLEVEL;
                 else
-                        return IORESOURCE_IRQ_HIGHLEVEL;
+                        flags = IORESOURCE_IRQ_HIGHLEVEL;
         } else {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        return IORESOURCE_IRQ_LOWEDGE;
+                        flags = IORESOURCE_IRQ_LOWEDGE;
                 else
-                        return IORESOURCE_IRQ_HIGHEDGE;
+                        flags = IORESOURCE_IRQ_HIGHEDGE;
         }
+
+        if (shareable)
+                flags |= IORESOURCE_IRQ_SHAREABLE;
+
+        return flags;
 }
 
 static void decode_irq_flags(int flag, int *triggering, int *polarity)
@@ -69,29 +78,16 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
         }
 }
 
-static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
+static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
                                                 u32 gsi, int triggering,
                                                 int polarity, int shareable)
 {
-        int i = 0;
-        int irq;
+        int irq, flags;
         int p, t;
-        static unsigned char warned;
 
         if (!valid_IRQ(gsi))
                 return;
 
-        while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
-               i < PNP_MAX_IRQ)
-                i++;
-        if (i >= PNP_MAX_IRQ) {
-                if (!warned) {
-                        printk(KERN_WARNING "pnpacpi: exceeded the max number"
-                                " of IRQ resources: %d\n", PNP_MAX_IRQ);
-                        warned = 1;
-                }
-                return;
-        }
         /*
          * in IO-APIC mode, use overrided attribute. Two reasons:
          * 1. BIOS bug in DSDT
@@ -102,27 +98,21 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
                 p = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
 
                 if (triggering != t || polarity != p) {
-                        pnp_warn("IRQ %d override to %s, %s",
+                        dev_warn(&dev->dev, "IRQ %d override to %s, %s\n",
                                 gsi, t ? "edge":"level", p ? "low":"high");
                         triggering = t;
                         polarity = p;
                 }
         }
 
-        res->irq_resource[i].flags = IORESOURCE_IRQ;    // Also clears _UNSET flag
-        res->irq_resource[i].flags |= irq_flags(triggering, polarity);
+        flags = irq_flags(triggering, polarity, shareable);
         irq = acpi_register_gsi(gsi, triggering, polarity);
-        if (irq < 0) {
-                res->irq_resource[i].flags |= IORESOURCE_DISABLED;
-                return;
-        }
-
-        if (shareable)
-                res->irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;
+        if (irq >= 0)
+                pcibios_penalize_isa_irq(irq, 1);
+        else
+                flags |= IORESOURCE_DISABLED;
 
-        res->irq_resource[i].start = irq;
-        res->irq_resource[i].end = irq;
-        pcibios_penalize_isa_irq(irq, 1);
+        pnp_add_irq_resource(dev, irq, flags);
 }
 
 static int dma_flags(int type, int bus_master, int transfer)
@@ -168,88 +158,36 @@ static int dma_flags(int type, int bus_master, int transfer)
         return flags;
 }
 
-static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
-                                                u32 dma, int type,
-                                                int bus_master, int transfer)
+static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start,
+                                               u64 len, int io_decode)
 {
-        int i = 0;
-        static unsigned char warned;
-
-        while (i < PNP_MAX_DMA &&
-               !(res->dma_resource[i].flags & IORESOURCE_UNSET))
-                i++;
-        if (i < PNP_MAX_DMA) {
-                res->dma_resource[i].flags = IORESOURCE_DMA;    // Also clears _UNSET flag
-                res->dma_resource[i].flags |=
-                    dma_flags(type, bus_master, transfer);
-                if (dma == -1) {
-                        res->dma_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->dma_resource[i].start = dma;
-                res->dma_resource[i].end = dma;
-        } else if (!warned) {
-                printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "
-                                "resources: %d \n", PNP_MAX_DMA);
-                warned = 1;
-        }
-}
+        int flags = 0;
+        u64 end = start + len - 1;
 
-static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
-                                               u64 io, u64 len, int io_decode)
-{
-        int i = 0;
-        static unsigned char warned;
+        if (io_decode == ACPI_DECODE_16)
+                flags |= PNP_PORT_FLAG_16BITADDR;
+        if (len == 0 || end >= 0x10003)
+                flags |= IORESOURCE_DISABLED;
 
-        while (!(res->port_resource[i].flags & IORESOURCE_UNSET) &&
-               i < PNP_MAX_PORT)
-                i++;
-        if (i < PNP_MAX_PORT) {
-                res->port_resource[i].flags = IORESOURCE_IO;    // Also clears _UNSET flag
-                if (io_decode == ACPI_DECODE_16)
-                        res->port_resource[i].flags |= PNP_PORT_FLAG_16BITADDR;
-                if (len <= 0 || (io + len - 1) >= 0x10003) {
-                        res->port_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->port_resource[i].start = io;
-                res->port_resource[i].end = io + len - 1;
-        } else if (!warned) {
-                printk(KERN_WARNING "pnpacpi: exceeded the max number of IO "
-                                "resources: %d \n", PNP_MAX_PORT);
-                warned = 1;
-        }
+        pnp_add_io_resource(dev, start, end, flags);
 }
 
-static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
-                                                u64 mem, u64 len,
+static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev,
+                                                u64 start, u64 len,
                                                 int write_protect)
 {
-        int i = 0;
-        static unsigned char warned;
+        int flags = 0;
+        u64 end = start + len - 1;
 
-        while (!(res->mem_resource[i].flags & IORESOURCE_UNSET) &&
-               (i < PNP_MAX_MEM))
-                i++;
-        if (i < PNP_MAX_MEM) {
-                res->mem_resource[i].flags = IORESOURCE_MEM;    // Also clears _UNSET flag
-                if (len <= 0) {
-                        res->mem_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                if (write_protect == ACPI_READ_WRITE_MEMORY)
-                        res->mem_resource[i].flags |= IORESOURCE_MEM_WRITEABLE;
-
-                res->mem_resource[i].start = mem;
-                res->mem_resource[i].end = mem + len - 1;
-        } else if (!warned) {
-                printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "
-                                "resources: %d\n", PNP_MAX_MEM);
-                warned = 1;
-        }
+        if (len == 0)
+                flags |= IORESOURCE_DISABLED;
+        if (write_protect == ACPI_READ_WRITE_MEMORY)
+                flags |= IORESOURCE_MEM_WRITEABLE;
+
+        pnp_add_mem_resource(dev, start, end, flags);
 }
 
-static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
+static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
                                                   struct acpi_resource *res)
 {
         struct acpi_resource_address64 addr, *p = &addr;
@@ -257,7 +195,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
 
         status = acpi_resource_to_address64(res, p);
         if (!ACPI_SUCCESS(status)) {
-                pnp_warn("PnPACPI: failed to convert resource type %d",
+                dev_warn(&dev->dev, "failed to convert resource type %d\n",
                          res->type);
                 return;
         }
@@ -266,11 +204,11 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
                 return;
 
         if (p->resource_type == ACPI_MEMORY_RANGE)
-                pnpacpi_parse_allocated_memresource(res_table,
+                pnpacpi_parse_allocated_memresource(dev,
                         p->minimum, p->address_length,
                         p->info.mem.write_protect);
         else if (p->resource_type == ACPI_IO_RANGE)
-                pnpacpi_parse_allocated_ioresource(res_table,
+                pnpacpi_parse_allocated_ioresource(dev,
                         p->minimum, p->address_length,
                         p->granularity == 0xfff ? ACPI_DECODE_10 :
                                 ACPI_DECODE_16);
@@ -279,8 +217,16 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                               void *data)
 {
-        struct pnp_resource_table *res_table = data;
-        int i;
+        struct pnp_dev *dev = data;
+        struct acpi_resource_irq *irq;
+        struct acpi_resource_dma *dma;
+        struct acpi_resource_io *io;
+        struct acpi_resource_fixed_io *fixed_io;
+        struct acpi_resource_memory24 *memory24;
+        struct acpi_resource_memory32 *memory32;
+        struct acpi_resource_fixed_memory32 *fixed_memory32;
+        struct acpi_resource_extended_irq *extended_irq;
+        int i, flags;
 
         switch (res->type) {
         case ACPI_RESOURCE_TYPE_IRQ:
@@ -288,29 +234,33 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                  * Per spec, only one interrupt per descriptor is allowed in
                  * _CRS, but some firmware violates this, so parse them all.
                  */
-                for (i = 0; i < res->data.irq.interrupt_count; i++) {
-                        pnpacpi_parse_allocated_irqresource(res_table,
-                                res->data.irq.interrupts[i],
-                                res->data.irq.triggering,
-                                res->data.irq.polarity,
-                                res->data.irq.sharable);
+                irq = &res->data.irq;
+                for (i = 0; i < irq->interrupt_count; i++) {
+                        pnpacpi_parse_allocated_irqresource(dev,
+                                irq->interrupts[i],
+                                irq->triggering,
+                                irq->polarity,
+                                irq->sharable);
                 }
                 break;
 
         case ACPI_RESOURCE_TYPE_DMA:
-                if (res->data.dma.channel_count > 0)
-                        pnpacpi_parse_allocated_dmaresource(res_table,
-                                res->data.dma.channels[0],
-                                res->data.dma.type,
-                                res->data.dma.bus_master,
-                                res->data.dma.transfer);
+                dma = &res->data.dma;
+                if (dma->channel_count > 0) {
+                        flags = dma_flags(dma->type, dma->bus_master,
+                                          dma->transfer);
+                        if (dma->channels[0] == (u8) -1)
+                                flags |= IORESOURCE_DISABLED;
+                        pnp_add_dma_resource(dev, dma->channels[0], flags);
+                }
                 break;
 
         case ACPI_RESOURCE_TYPE_IO:
-                pnpacpi_parse_allocated_ioresource(res_table,
-                        res->data.io.minimum,
-                        res->data.io.address_length,
-                        res->data.io.io_decode);
+                io = &res->data.io;
+                pnpacpi_parse_allocated_ioresource(dev,
+                        io->minimum,
+                        io->address_length,
+                        io->io_decode);
                 break;
 
         case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -318,9 +268,10 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 break;
 
         case ACPI_RESOURCE_TYPE_FIXED_IO:
-                pnpacpi_parse_allocated_ioresource(res_table,
-                        res->data.fixed_io.address,
-                        res->data.fixed_io.address_length,
+                fixed_io = &res->data.fixed_io;
+                pnpacpi_parse_allocated_ioresource(dev,
+                        fixed_io->address,
+                        fixed_io->address_length,
                         ACPI_DECODE_10);
                 break;
 
@@ -331,27 +282,30 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 break;
 
         case ACPI_RESOURCE_TYPE_MEMORY24:
-                pnpacpi_parse_allocated_memresource(res_table,
-                        res->data.memory24.minimum,
-                        res->data.memory24.address_length,
-                        res->data.memory24.write_protect);
+                memory24 = &res->data.memory24;
+                pnpacpi_parse_allocated_memresource(dev,
+                        memory24->minimum,
+                        memory24->address_length,
+                        memory24->write_protect);
                 break;
         case ACPI_RESOURCE_TYPE_MEMORY32:
-                pnpacpi_parse_allocated_memresource(res_table,
-                        res->data.memory32.minimum,
-                        res->data.memory32.address_length,
-                        res->data.memory32.write_protect);
+                memory32 = &res->data.memory32;
+                pnpacpi_parse_allocated_memresource(dev,
+                        memory32->minimum,
+                        memory32->address_length,
+                        memory32->write_protect);
                 break;
         case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-                pnpacpi_parse_allocated_memresource(res_table,
-                        res->data.fixed_memory32.address,
-                        res->data.fixed_memory32.address_length,
-                        res->data.fixed_memory32.write_protect);
+                fixed_memory32 = &res->data.fixed_memory32;
+                pnpacpi_parse_allocated_memresource(dev,
+                        fixed_memory32->address,
+                        fixed_memory32->address_length,
+                        fixed_memory32->write_protect);
                 break;
         case ACPI_RESOURCE_TYPE_ADDRESS16:
         case ACPI_RESOURCE_TYPE_ADDRESS32:
         case ACPI_RESOURCE_TYPE_ADDRESS64:
-                pnpacpi_parse_allocated_address_space(res_table, res);
+                pnpacpi_parse_allocated_address_space(dev, res);
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
@@ -360,15 +314,16 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-                if (res->data.extended_irq.producer_consumer == ACPI_PRODUCER)
+                extended_irq = &res->data.extended_irq;
+                if (extended_irq->producer_consumer == ACPI_PRODUCER)
                         return AE_OK;
 
-                for (i = 0; i < res->data.extended_irq.interrupt_count; i++) {
-                        pnpacpi_parse_allocated_irqresource(res_table,
-                                res->data.extended_irq.interrupts[i],
-                                res->data.extended_irq.triggering,
-                                res->data.extended_irq.polarity,
-                                res->data.extended_irq.sharable);
+                for (i = 0; i < extended_irq->interrupt_count; i++) {
+                        pnpacpi_parse_allocated_irqresource(dev,
+                                extended_irq->interrupts[i],
+                                extended_irq->triggering,
+                                extended_irq->polarity,
+                                extended_irq->sharable);
                 }
                 break;
 
@@ -376,24 +331,36 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 break;
 
         default:
-                pnp_warn("PnPACPI: unknown resource type %d", res->type);
+                dev_warn(&dev->dev, "unknown resource type %d in _CRS\n",
+                         res->type);
                 return AE_ERROR;
         }
 
         return AE_OK;
 }
 
-acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle,
-                                             struct pnp_resource_table * res)
+int pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
 {
-        /* Blank the resource table values */
-        pnp_init_resource_table(res);
+        acpi_handle handle = dev->data;
+        acpi_status status;
+
+        dev_dbg(&dev->dev, "parse allocated resources\n");
 
-        return acpi_walk_resources(handle, METHOD_NAME__CRS,
-                                   pnpacpi_allocated_resource, res);
+        pnp_init_resources(dev);
+
+        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
+                                     pnpacpi_allocated_resource, dev);
+
+        if (ACPI_FAILURE(status)) {
+                if (status != AE_NOT_FOUND)
+                        dev_err(&dev->dev, "can't evaluate _CRS: %d", status);
+                return -EPERM;
+        }
+        return 0;
 }
 
-static __init void pnpacpi_parse_dma_option(struct pnp_option *option,
+static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
+                                            struct pnp_option *option,
                                             struct acpi_resource_dma *p)
 {
         int i;
@@ -410,10 +377,11 @@ static __init void pnpacpi_parse_dma_option(struct pnp_option *option,
 
         dma->flags = dma_flags(p->type, p->bus_master, p->transfer);
 
-        pnp_register_dma_resource(option, dma);
+        pnp_register_dma_resource(dev, option, dma);
 }
 
-static __init void pnpacpi_parse_irq_option(struct pnp_option *option,
+static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
+                                            struct pnp_option *option,
                                             struct acpi_resource_irq *p)
 {
         int i;
@@ -428,12 +396,13 @@ static __init void pnpacpi_parse_irq_option(struct pnp_option *option,
         for (i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], irq->map);
-        irq->flags = irq_flags(p->triggering, p->polarity);
+        irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
 
-        pnp_register_irq_resource(option, irq);
+        pnp_register_irq_resource(dev, option, irq);
 }
 
-static __init void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
+static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
+                                                struct pnp_option *option,
                                         struct acpi_resource_extended_irq *p)
 {
         int i;
@@ -448,12 +417,13 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
         for (i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], irq->map);
-        irq->flags = irq_flags(p->triggering, p->polarity);
+        irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
 
-        pnp_register_irq_resource(option, irq);
+        pnp_register_irq_resource(dev, option, irq);
 }
 
-static __init void pnpacpi_parse_port_option(struct pnp_option *option,
+static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
+                                             struct pnp_option *option,
                                              struct acpi_resource_io *io)
 {
         struct pnp_port *port;
@@ -469,10 +439,11 @@ static __init void pnpacpi_parse_port_option(struct pnp_option *option,
         port->size = io->address_length;
         port->flags = ACPI_DECODE_16 == io->io_decode ?
             PNP_PORT_FLAG_16BITADDR : 0;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
-static __init void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
+static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
+                                                   struct pnp_option *option,
                                         struct acpi_resource_fixed_io *io)
 {
         struct pnp_port *port;
@@ -486,10 +457,11 @@ static __init void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
         port->size = io->address_length;
         port->align = 0;
         port->flags = PNP_PORT_FLAG_FIXED;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
-static __init void pnpacpi_parse_mem24_option(struct pnp_option *option,
+static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
+                                              struct pnp_option *option,
                                               struct acpi_resource_memory24 *p)
 {
         struct pnp_mem *mem;
@@ -507,10 +479,11 @@ static __init void pnpacpi_parse_mem24_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
             IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpacpi_parse_mem32_option(struct pnp_option *option,
+static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev,
+                                              struct pnp_option *option,
                                               struct acpi_resource_memory32 *p)
 {
         struct pnp_mem *mem;
@@ -528,10 +501,11 @@ static __init void pnpacpi_parse_mem32_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
             IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
+static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev,
+                                                    struct pnp_option *option,
                                         struct acpi_resource_fixed_memory32 *p)
 {
         struct pnp_mem *mem;
@@ -548,10 +522,11 @@ static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
             IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpacpi_parse_address_option(struct pnp_option *option,
+static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
+                                                struct pnp_option *option,
                                                 struct acpi_resource *r)
 {
         struct acpi_resource_address64 addr, *p = &addr;
@@ -579,7 +554,7 @@ static __init void pnpacpi_parse_address_option(struct pnp_option *option,
                 mem->flags = (p->info.mem.write_protect ==
                               ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE
                     : 0;
-                pnp_register_mem_resource(option, mem);
+                pnp_register_mem_resource(dev, option, mem);
         } else if (p->resource_type == ACPI_IO_RANGE) {
                 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
                 if (!port)
@@ -588,7 +563,7 @@ static __init void pnpacpi_parse_address_option(struct pnp_option *option,
                 port->size = p->address_length;
                 port->align = 0;
                 port->flags = PNP_PORT_FLAG_FIXED;
-                pnp_register_port_resource(option, port);
+                pnp_register_port_resource(dev, option, port);
         }
 }
 
@@ -608,11 +583,11 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
 
         switch (res->type) {
         case ACPI_RESOURCE_TYPE_IRQ:
-                pnpacpi_parse_irq_option(option, &res->data.irq);
+                pnpacpi_parse_irq_option(dev, option, &res->data.irq);
                 break;
 
         case ACPI_RESOURCE_TYPE_DMA:
-                pnpacpi_parse_dma_option(option, &res->data.dma);
+                pnpacpi_parse_dma_option(dev, option, &res->data.dma);
                 break;
 
         case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -642,19 +617,22 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
         case ACPI_RESOURCE_TYPE_END_DEPENDENT:
                 /*only one EndDependentFn is allowed */
                 if (!parse_data->option_independent) {
-                        pnp_warn("PnPACPI: more than one EndDependentFn");
+                        dev_warn(&dev->dev, "more than one EndDependentFn "
+                                 "in _PRS\n");
                         return AE_ERROR;
                 }
                 parse_data->option = parse_data->option_independent;
                 parse_data->option_independent = NULL;
+                dev_dbg(&dev->dev, "end dependent options\n");
                 break;
 
         case ACPI_RESOURCE_TYPE_IO:
-                pnpacpi_parse_port_option(option, &res->data.io);
+                pnpacpi_parse_port_option(dev, option, &res->data.io);
                 break;
 
         case ACPI_RESOURCE_TYPE_FIXED_IO:
-                pnpacpi_parse_fixed_port_option(option, &res->data.fixed_io);
+                pnpacpi_parse_fixed_port_option(dev, option,
+                                                &res->data.fixed_io);
                 break;
 
         case ACPI_RESOURCE_TYPE_VENDOR:
@@ -662,57 +640,67 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                 break;
 
         case ACPI_RESOURCE_TYPE_MEMORY24:
-                pnpacpi_parse_mem24_option(option, &res->data.memory24);
+                pnpacpi_parse_mem24_option(dev, option, &res->data.memory24);
                 break;
 
         case ACPI_RESOURCE_TYPE_MEMORY32:
-                pnpacpi_parse_mem32_option(option, &res->data.memory32);
+                pnpacpi_parse_mem32_option(dev, option, &res->data.memory32);
                 break;
 
         case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-                pnpacpi_parse_fixed_mem32_option(option,
+                pnpacpi_parse_fixed_mem32_option(dev, option,
                                                  &res->data.fixed_memory32);
                 break;
 
         case ACPI_RESOURCE_TYPE_ADDRESS16:
         case ACPI_RESOURCE_TYPE_ADDRESS32:
         case ACPI_RESOURCE_TYPE_ADDRESS64:
-                pnpacpi_parse_address_option(option, res);
+                pnpacpi_parse_address_option(dev, option, res);
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-                pnpacpi_parse_ext_irq_option(option, &res->data.extended_irq);
+                pnpacpi_parse_ext_irq_option(dev, option,
+                                             &res->data.extended_irq);
                 break;
 
         case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
                 break;
 
         default:
-                pnp_warn("PnPACPI: unknown resource type %d", res->type);
+                dev_warn(&dev->dev, "unknown resource type %d in _PRS\n",
+                         res->type);
                 return AE_ERROR;
         }
 
         return AE_OK;
 }
 
-acpi_status __init pnpacpi_parse_resource_option_data(acpi_handle handle,
-                                                      struct pnp_dev *dev)
+int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
 {
+        acpi_handle handle = dev->data;
         acpi_status status;
         struct acpipnp_parse_option_s parse_data;
 
+        dev_dbg(&dev->dev, "parse resource options\n");
+
         parse_data.option = pnp_register_independent_option(dev);
         if (!parse_data.option)
-                return AE_ERROR;
+                return -ENOMEM;
+
         parse_data.option_independent = parse_data.option;
         parse_data.dev = dev;
         status = acpi_walk_resources(handle, METHOD_NAME__PRS,
                                      pnpacpi_option_resource, &parse_data);
 
-        return status;
+        if (ACPI_FAILURE(status)) {
+                if (status != AE_NOT_FOUND)
+                        dev_err(&dev->dev, "can't evaluate _PRS: %d", status);
+                return -EPERM;
+        }
+        return 0;
 }
 
 static int pnpacpi_supported_resource(struct acpi_resource *res)
@@ -760,9 +748,10 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
         return AE_OK;
 }
 
-int pnpacpi_build_resource_template(acpi_handle handle,
+int pnpacpi_build_resource_template(struct pnp_dev *dev,
                                     struct acpi_buffer *buffer)
 {
+        acpi_handle handle = dev->data;
         struct acpi_resource *resource;
         int res_cnt = 0;
         acpi_status status;
@@ -770,7 +759,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                                      pnpacpi_count_resources, &res_cnt);
         if (ACPI_FAILURE(status)) {
-                pnp_err("Evaluate _CRS failed");
+                dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
                 return -EINVAL;
         }
         if (!res_cnt)
@@ -779,13 +768,13 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL);
         if (!buffer->pointer)
                 return -ENOMEM;
-        pnp_dbg("Res cnt %d", res_cnt);
+
         resource = (struct acpi_resource *)buffer->pointer;
         status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                                      pnpacpi_type_resources, &resource);
         if (ACPI_FAILURE(status)) {
                 kfree(buffer->pointer);
-                pnp_err("Evaluate _CRS failed");
+                dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
                 return -EINVAL;
         }
         /* resource will pointer the end resource now */
@@ -794,129 +783,184 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         return 0;
 }
 
-static void pnpacpi_encode_irq(struct acpi_resource *resource,
+static void pnpacpi_encode_irq(struct pnp_dev *dev,
+                               struct acpi_resource *resource,
                                struct resource *p)
 {
+        struct acpi_resource_irq *irq = &resource->data.irq;
         int triggering, polarity;
 
         decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
-        resource->data.irq.triggering = triggering;
-        resource->data.irq.polarity = polarity;
+        irq->triggering = triggering;
+        irq->polarity = polarity;
         if (triggering == ACPI_EDGE_SENSITIVE)
-                resource->data.irq.sharable = ACPI_EXCLUSIVE;
+                irq->sharable = ACPI_EXCLUSIVE;
         else
-                resource->data.irq.sharable = ACPI_SHARED;
-        resource->data.irq.interrupt_count = 1;
-        resource->data.irq.interrupts[0] = p->start;
+                irq->sharable = ACPI_SHARED;
+        irq->interrupt_count = 1;
+        irq->interrupts[0] = p->start;
+
+        dev_dbg(&dev->dev, "  encode irq %d %s %s %s\n", (int) p->start,
+                triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
+                polarity == ACPI_ACTIVE_LOW ? "low" : "high",
+                irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
 }
 
-static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
+static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
+                                   struct acpi_resource *resource,
                                    struct resource *p)
 {
+        struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq;
         int triggering, polarity;
 
         decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
-        resource->data.extended_irq.producer_consumer = ACPI_CONSUMER;
-        resource->data.extended_irq.triggering = triggering;
-        resource->data.extended_irq.polarity = polarity;
+        extended_irq->producer_consumer = ACPI_CONSUMER;
+        extended_irq->triggering = triggering;
+        extended_irq->polarity = polarity;
         if (triggering == ACPI_EDGE_SENSITIVE)
-                resource->data.irq.sharable = ACPI_EXCLUSIVE;
+                extended_irq->sharable = ACPI_EXCLUSIVE;
         else
-                resource->data.irq.sharable = ACPI_SHARED;
-        resource->data.extended_irq.interrupt_count = 1;
-        resource->data.extended_irq.interrupts[0] = p->start;
+                extended_irq->sharable = ACPI_SHARED;
+        extended_irq->interrupt_count = 1;
+        extended_irq->interrupts[0] = p->start;
+
+        dev_dbg(&dev->dev, "  encode irq %d %s %s %s\n", (int) p->start,
+                triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
+                polarity == ACPI_ACTIVE_LOW ? "low" : "high",
+                extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
 }
 
-static void pnpacpi_encode_dma(struct acpi_resource *resource,
+static void pnpacpi_encode_dma(struct pnp_dev *dev,
+                               struct acpi_resource *resource,
                                struct resource *p)
 {
+        struct acpi_resource_dma *dma = &resource->data.dma;
+
         /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
         switch (p->flags & IORESOURCE_DMA_SPEED_MASK) {
         case IORESOURCE_DMA_TYPEA:
-                resource->data.dma.type = ACPI_TYPE_A;
+                dma->type = ACPI_TYPE_A;
                 break;
         case IORESOURCE_DMA_TYPEB:
-                resource->data.dma.type = ACPI_TYPE_B;
+                dma->type = ACPI_TYPE_B;
                 break;
         case IORESOURCE_DMA_TYPEF:
-                resource->data.dma.type = ACPI_TYPE_F;
+                dma->type = ACPI_TYPE_F;
                 break;
         default:
-                resource->data.dma.type = ACPI_COMPATIBILITY;
+                dma->type = ACPI_COMPATIBILITY;
         }
 
         switch (p->flags & IORESOURCE_DMA_TYPE_MASK) {
         case IORESOURCE_DMA_8BIT:
-                resource->data.dma.transfer = ACPI_TRANSFER_8;
+                dma->transfer = ACPI_TRANSFER_8;
                 break;
         case IORESOURCE_DMA_8AND16BIT:
-                resource->data.dma.transfer = ACPI_TRANSFER_8_16;
+                dma->transfer = ACPI_TRANSFER_8_16;
                 break;
         default:
-                resource->data.dma.transfer = ACPI_TRANSFER_16;
+                dma->transfer = ACPI_TRANSFER_16;
         }
 
-        resource->data.dma.bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
-        resource->data.dma.channel_count = 1;
-        resource->data.dma.channels[0] = p->start;
+        dma->bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
+        dma->channel_count = 1;
+        dma->channels[0] = p->start;
+
+        dev_dbg(&dev->dev, "  encode dma %d "
+                "type %#x transfer %#x master %d\n",
+                (int) p->start, dma->type, dma->transfer, dma->bus_master);
 }
 
-static void pnpacpi_encode_io(struct acpi_resource *resource,
+static void pnpacpi_encode_io(struct pnp_dev *dev,
+                              struct acpi_resource *resource,
                               struct resource *p)
 {
+        struct acpi_resource_io *io = &resource->data.io;
+
         /* Note: pnp_assign_port will copy pnp_port->flags into p->flags */
-        resource->data.io.io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR) ?
+        io->io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR) ?
             ACPI_DECODE_16 : ACPI_DECODE_10;
-        resource->data.io.minimum = p->start;
-        resource->data.io.maximum = p->end;
-        resource->data.io.alignment = 0;        /* Correct? */
-        resource->data.io.address_length = p->end - p->start + 1;
+        io->minimum = p->start;
+        io->maximum = p->end;
+        io->alignment = 0;      /* Correct? */
+        io->address_length = p->end - p->start + 1;
+
+        dev_dbg(&dev->dev, "  encode io %#llx-%#llx decode %#x\n",
+                (unsigned long long) p->start, (unsigned long long) p->end,
+                io->io_decode);
 }
 
-static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,
+static void pnpacpi_encode_fixed_io(struct pnp_dev *dev,
+                                    struct acpi_resource *resource,
                                     struct resource *p)
 {
-        resource->data.fixed_io.address = p->start;
-        resource->data.fixed_io.address_length = p->end - p->start + 1;
+        struct acpi_resource_fixed_io *fixed_io = &resource->data.fixed_io;
+
+        fixed_io->address = p->start;
+        fixed_io->address_length = p->end - p->start + 1;
+
+        dev_dbg(&dev->dev, "  encode fixed_io %#llx-%#llx\n",
+                (unsigned long long) p->start, (unsigned long long) p->end);
 }
 
-static void pnpacpi_encode_mem24(struct acpi_resource *resource,
+static void pnpacpi_encode_mem24(struct pnp_dev *dev,
+                                 struct acpi_resource *resource,
                                  struct resource *p)
 {
+        struct acpi_resource_memory24 *memory24 = &resource->data.memory24;
+
         /* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */
-        resource->data.memory24.write_protect =
+        memory24->write_protect =
             (p->flags & IORESOURCE_MEM_WRITEABLE) ?
             ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.memory24.minimum = p->start;
-        resource->data.memory24.maximum = p->end;
-        resource->data.memory24.alignment = 0;
-        resource->data.memory24.address_length = p->end - p->start + 1;
+        memory24->minimum = p->start;
+        memory24->maximum = p->end;
+        memory24->alignment = 0;
+        memory24->address_length = p->end - p->start + 1;
+
+        dev_dbg(&dev->dev, "  encode mem24 %#llx-%#llx write_protect %#x\n",
+                (unsigned long long) p->start, (unsigned long long) p->end,
+                memory24->write_protect);
 }
 
-static void pnpacpi_encode_mem32(struct acpi_resource *resource,
+static void pnpacpi_encode_mem32(struct pnp_dev *dev,
+                                 struct acpi_resource *resource,
                                  struct resource *p)
 {
-        resource->data.memory32.write_protect =
+        struct acpi_resource_memory32 *memory32 = &resource->data.memory32;
+
+        memory32->write_protect =
             (p->flags & IORESOURCE_MEM_WRITEABLE) ?
             ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.memory32.minimum = p->start;
-        resource->data.memory32.maximum = p->end;
-        resource->data.memory32.alignment = 0;
-        resource->data.memory32.address_length = p->end - p->start + 1;
+        memory32->minimum = p->start;
+        memory32->maximum = p->end;
+        memory32->alignment = 0;
+        memory32->address_length = p->end - p->start + 1;
+
+        dev_dbg(&dev->dev, "  encode mem32 %#llx-%#llx write_protect %#x\n",
+                (unsigned long long) p->start, (unsigned long long) p->end,
+                memory32->write_protect);
 }
 
-static void pnpacpi_encode_fixed_mem32(struct acpi_resource *resource,
+static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
+                                       struct acpi_resource *resource,
                                        struct resource *p)
 {
-        resource->data.fixed_memory32.write_protect =
+        struct acpi_resource_fixed_memory32 *fixed_memory32 = &resource->data.fixed_memory32;
+
+        fixed_memory32->write_protect =
             (p->flags & IORESOURCE_MEM_WRITEABLE) ?
             ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.fixed_memory32.address = p->start;
-        resource->data.fixed_memory32.address_length = p->end - p->start + 1;
+        fixed_memory32->address = p->start;
+        fixed_memory32->address_length = p->end - p->start + 1;
+
+        dev_dbg(&dev->dev, "  encode fixed_mem32 %#llx-%#llx "
+                "write_protect %#x\n",
+                (unsigned long long) p->start, (unsigned long long) p->end,
+                fixed_memory32->write_protect);
 }
 
-int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
-                             struct acpi_buffer *buffer)
+int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
 {
         int i = 0;
         /* pnpacpi_build_resource_template allocates extra mem */
@@ -924,58 +968,48 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
         struct acpi_resource *resource = buffer->pointer;
         int port = 0, irq = 0, dma = 0, mem = 0;
 
-        pnp_dbg("res cnt %d", res_cnt);
+        dev_dbg(&dev->dev, "encode %d resources\n", res_cnt);
         while (i < res_cnt) {
                 switch (resource->type) {
                 case ACPI_RESOURCE_TYPE_IRQ:
-                        pnp_dbg("Encode irq");
-                        pnpacpi_encode_irq(resource,
-                                           &res_table->irq_resource[irq]);
+                        pnpacpi_encode_irq(dev, resource,
+                               pnp_get_resource(dev, IORESOURCE_IRQ, irq));
                         irq++;
                         break;
 
                 case ACPI_RESOURCE_TYPE_DMA:
-                        pnp_dbg("Encode dma");
-                        pnpacpi_encode_dma(resource,
-                                           &res_table->dma_resource[dma]);
+                        pnpacpi_encode_dma(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_DMA, dma));
                         dma++;
                         break;
                 case ACPI_RESOURCE_TYPE_IO:
-                        pnp_dbg("Encode io");
-                        pnpacpi_encode_io(resource,
-                                          &res_table->port_resource[port]);
+                        pnpacpi_encode_io(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_IO, port));
                         port++;
                         break;
                 case ACPI_RESOURCE_TYPE_FIXED_IO:
-                        pnp_dbg("Encode fixed io");
-                        pnpacpi_encode_fixed_io(resource,
-                                                &res_table->
-                                                port_resource[port]);
+                        pnpacpi_encode_fixed_io(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_IO, port));
                         port++;
                         break;
                 case ACPI_RESOURCE_TYPE_MEMORY24:
-                        pnp_dbg("Encode mem24");
-                        pnpacpi_encode_mem24(resource,
-                                             &res_table->mem_resource[mem]);
+                        pnpacpi_encode_mem24(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_MEMORY32:
-                        pnp_dbg("Encode mem32");
-                        pnpacpi_encode_mem32(resource,
-                                             &res_table->mem_resource[mem]);
+                        pnpacpi_encode_mem32(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
-                        pnp_dbg("Encode fixed mem32");
-                        pnpacpi_encode_fixed_mem32(resource,
-                                                   &res_table->
-                                                   mem_resource[mem]);
+                        pnpacpi_encode_fixed_mem32(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-                        pnp_dbg("Encode ext irq");
-                        pnpacpi_encode_ext_irq(resource,
-                                               &res_table->irq_resource[irq]);
+                        pnpacpi_encode_ext_irq(dev, resource,
+                                pnp_get_resource(dev, IORESOURCE_IRQ, irq));
                         irq++;
                         break;
                 case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -988,7 +1022,8 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
                 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
                 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
                 default:        /* other type */
-                        pnp_warn("unknown resource type %d", resource->type);
+                        dev_warn(&dev->dev, "can't encode unknown resource "
+                                 "type %d\n", resource->type);
                         return -EINVAL;
                 }
                 resource++;
diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile
index 3cd3ed760605..310e2b3a7710 100644
--- a/drivers/pnp/pnpbios/Makefile
+++ b/drivers/pnp/pnpbios/Makefile
@@ -5,3 +5,7 @@
 pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o
 
 obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)
+
+ifeq ($(CONFIG_PNP_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index a8364d815222..7ff824496b39 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -7,7 +7,6 @@
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <linux/kernel.h>
-#include <linux/pnpbios.h>
 #include <linux/device.h>
 #include <linux/pnp.h>
 #include <linux/mm.h>
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index a8a51500e1e9..19a4be1a9a31 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -50,7 +50,6 @@
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <linux/kernel.h>
-#include <linux/pnpbios.h>
 #include <linux/device.h>
 #include <linux/pnp.h>
 #include <linux/mm.h>
@@ -69,6 +68,7 @@
 #include <asm/system.h>
 #include <asm/byteorder.h>
 
+#include "../base.h"
 #include "pnpbios.h"
 
 /*
@@ -203,8 +203,7 @@ static int pnp_dock_thread(void *unused)
 
 #endif                          /* CONFIG_HOTPLUG */
 
-static int pnpbios_get_resources(struct pnp_dev *dev,
-                                 struct pnp_resource_table *res)
+static int pnpbios_get_resources(struct pnp_dev *dev)
 {
         u8 nodenum = dev->number;
         struct pnp_bios_node *node;
@@ -212,6 +211,7 @@ static int pnpbios_get_resources(struct pnp_dev *dev,
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
+        dev_dbg(&dev->dev, "get resources\n");
         node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
@@ -219,14 +219,13 @@ static int pnpbios_get_resources(struct pnp_dev *dev,
                 kfree(node);
                 return -ENODEV;
         }
-        pnpbios_read_resources_from_node(res, node);
+        pnpbios_read_resources_from_node(dev, node);
         dev->active = pnp_is_active(dev);
         kfree(node);
         return 0;
 }
 
-static int pnpbios_set_resources(struct pnp_dev *dev,
-                                 struct pnp_resource_table *res)
+static int pnpbios_set_resources(struct pnp_dev *dev)
 {
         u8 nodenum = dev->number;
         struct pnp_bios_node *node;
@@ -235,6 +234,7 @@ static int pnpbios_set_resources(struct pnp_dev *dev,
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
+        dev_dbg(&dev->dev, "set resources\n");
         node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
@@ -242,7 +242,7 @@ static int pnpbios_set_resources(struct pnp_dev *dev,
                 kfree(node);
                 return -ENODEV;
         }
-        if (pnpbios_write_resources_to_node(res, node) < 0) {
+        if (pnpbios_write_resources_to_node(dev, node) < 0) {
                 kfree(node);
                 return -1;
         }
@@ -317,7 +317,6 @@ static int __init insert_device(struct pnp_bios_node *node)
 {
         struct list_head *pos;
         struct pnp_dev *dev;
-        struct pnp_id *dev_id;
         char id[8];
 
         /* check if the device is already added */
@@ -327,20 +326,11 @@ static int __init insert_device(struct pnp_bios_node *node)
                         return -1;
         }
 
-        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        pnp_eisa_id_to_string(node->eisa_id & PNP_EISA_ID_MASK, id);
+        dev = pnp_alloc_dev(&pnpbios_protocol, node->handle, id);
         if (!dev)
                 return -1;
 
-        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
-        if (!dev_id) {
-                kfree(dev);
-                return -1;
-        }
-
-        dev->number = node->handle;
-        pnpid32_to_pnpid(node->eisa_id, id);
-        memcpy(dev_id->id, id, 7);
-        pnp_add_id(dev_id, dev);
         pnpbios_parse_data_stream(dev, node);
         dev->active = pnp_is_active(dev);
         dev->flags = node->flags;
@@ -353,11 +343,10 @@ static int __init insert_device(struct pnp_bios_node *node)
                 dev->capabilities |= PNP_WRITE;
         if (dev->flags & PNPBIOS_REMOVABLE)
                 dev->capabilities |= PNP_REMOVABLE;
-        dev->protocol = &pnpbios_protocol;
 
         /* clear out the damaged flags */
         if (!dev->active)
-                pnp_init_resource_table(&dev->res);
+                pnp_init_resources(dev);
 
         pnp_add_device(dev);
         pnpbios_interface_attach_device(node);
diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h
index d8cb2fd1f127..b09cf6dc2075 100644
--- a/drivers/pnp/pnpbios/pnpbios.h
+++ b/drivers/pnp/pnpbios/pnpbios.h
@@ -2,6 +2,142 @@
  * pnpbios.h - contains local definitions
  */
 
+/*
+ * Include file for the interface to a PnP BIOS
+ *
+ * Original BIOS code (C) 1998 Christian Schmidt (chr.schmidt@tu-bs.de)
+ * PnP handler parts (c) 1998 Tom Lees <tom@lpsg.demon.co.uk>
+ * Minor reorganizations by David Hinds <dahinds@users.sourceforge.net>
+ *
+ * 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, 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * Return codes
+ */
+#define PNP_SUCCESS                     0x00
+#define PNP_NOT_SET_STATICALLY          0x7f
+#define PNP_UNKNOWN_FUNCTION            0x81
+#define PNP_FUNCTION_NOT_SUPPORTED      0x82
+#define PNP_INVALID_HANDLE              0x83
+#define PNP_BAD_PARAMETER               0x84
+#define PNP_SET_FAILED                  0x85
+#define PNP_EVENTS_NOT_PENDING          0x86
+#define PNP_SYSTEM_NOT_DOCKED           0x87
+#define PNP_NO_ISA_PNP_CARDS            0x88
+#define PNP_UNABLE_TO_DETERMINE_DOCK_CAPABILITIES 0x89
+#define PNP_CONFIG_CHANGE_FAILED_NO_BATTERY 0x8a
+#define PNP_CONFIG_CHANGE_FAILED_RESOURCE_CONFLICT 0x8b
+#define PNP_BUFFER_TOO_SMALL            0x8c
+#define PNP_USE_ESCD_SUPPORT            0x8d
+#define PNP_MESSAGE_NOT_SUPPORTED       0x8e
+#define PNP_HARDWARE_ERROR              0x8f
+
+#define ESCD_SUCCESS                    0x00
+#define ESCD_IO_ERROR_READING           0x55
+#define ESCD_INVALID                    0x56
+#define ESCD_BUFFER_TOO_SMALL           0x59
+#define ESCD_NVRAM_TOO_SMALL            0x5a
+#define ESCD_FUNCTION_NOT_SUPPORTED     0x81
+
+/*
+ * Events that can be received by "get event"
+ */
+#define PNPEV_ABOUT_TO_CHANGE_CONFIG    0x0001
+#define PNPEV_DOCK_CHANGED              0x0002
+#define PNPEV_SYSTEM_DEVICE_CHANGED     0x0003
+#define PNPEV_CONFIG_CHANGED_FAILED     0x0004
+#define PNPEV_UNKNOWN_SYSTEM_EVENT      0xffff
+/* 0x8000 through 0xfffe are OEM defined */
+
+/*
+ * Messages that should be sent through "send message"
+ */
+#define PNPMSG_OK                       0x00
+#define PNPMSG_ABORT                    0x01
+#define PNPMSG_UNDOCK_DEFAULT_ACTION    0x40
+#define PNPMSG_POWER_OFF                0x41
+#define PNPMSG_PNP_OS_ACTIVE            0x42
+#define PNPMSG_PNP_OS_INACTIVE          0x43
+
+/*
+ * Plug and Play BIOS flags
+ */
+#define PNPBIOS_NO_DISABLE              0x0001
+#define PNPBIOS_NO_CONFIG               0x0002
+#define PNPBIOS_OUTPUT                  0x0004
+#define PNPBIOS_INPUT                   0x0008
+#define PNPBIOS_BOOTABLE                0x0010
+#define PNPBIOS_DOCK                    0x0020
+#define PNPBIOS_REMOVABLE               0x0040
+#define pnpbios_is_static(x) (((x)->flags & 0x0100) == 0x0000)
+#define pnpbios_is_dynamic(x) ((x)->flags & 0x0080)
+
+/*
+ * Function Parameters
+ */
+#define PNPMODE_STATIC 1
+#define PNPMODE_DYNAMIC 0
+
+/* 0x8000 through 0xffff are OEM defined */
+
+#pragma pack(1)
+struct pnp_dev_node_info {
+        __u16 no_nodes;
+        __u16 max_node_size;
+};
+struct pnp_docking_station_info {
+        __u32 location_id;
+        __u32 serial;
+        __u16 capabilities;
+};
+struct pnp_isa_config_struc {
+        __u8 revision;
+        __u8 no_csns;
+        __u16 isa_rd_data_port;
+        __u16 reserved;
+};
+struct escd_info_struc {
+        __u16 min_escd_write_size;
+        __u16 escd_size;
+        __u32 nv_storage_base;
+};
+struct pnp_bios_node {
+        __u16 size;
+        __u8 handle;
+        __u32 eisa_id;
+        __u8 type_code[3];
+        __u16 flags;
+        __u8 data[0];
+};
+#pragma pack()
+
+/* non-exported */
+extern struct pnp_dev_node_info node_info;
+
+extern int pnp_bios_dev_node_info(struct pnp_dev_node_info *data);
+extern int pnp_bios_get_dev_node(u8 *nodenum, char config,
+                                 struct pnp_bios_node *data);
+extern int pnp_bios_set_dev_node(u8 nodenum, char config,
+                                 struct pnp_bios_node *data);
+extern int pnp_bios_get_stat_res(char *info);
+extern int pnp_bios_isapnp_config(struct pnp_isa_config_struc *data);
+extern int pnp_bios_escd_info(struct escd_info_struc *data);
+extern int pnp_bios_read_escd(char *data, u32 nvram_base);
+extern int pnp_bios_dock_station_info(struct pnp_docking_station_info *data);
+
 #pragma pack(1)
 union pnp_bios_install_struct {
         struct {
@@ -28,8 +164,8 @@ extern int pnp_bios_present(void);
 extern int  pnpbios_dont_use_current_config;
 
 extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node);
-extern int pnpbios_read_resources_from_node(struct pnp_resource_table *res, struct pnp_bios_node * node);
-extern int pnpbios_write_resources_to_node(struct pnp_resource_table *res, struct pnp_bios_node * node);
+extern int pnpbios_read_resources_from_node(struct pnp_dev *dev, struct pnp_bios_node *node);
+extern int pnpbios_write_resources_to_node(struct pnp_dev *dev, struct pnp_bios_node *node);
 extern void pnpid32_to_pnpid(u32 id, char *str);
 
 extern void pnpbios_print_status(const char * module, u16 status);
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 46d506f66259..b35d921bac6e 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
-#include <linux/pnpbios.h>
+#include <linux/pnp.h>
 #include <linux/init.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index caade3531416..2e2c457a0fea 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -4,7 +4,6 @@
 
 #include <linux/ctype.h>
 #include <linux/pnp.h>
-#include <linux/pnpbios.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 
@@ -16,6 +15,7 @@ inline void pcibios_penalize_isa_irq(int irq, int active)
 }
 #endif                          /* CONFIG_PCI */
 
+#include "../base.h"
 #include "pnpbios.h"
 
 /* standard resource tags */
@@ -53,97 +53,43 @@ inline void pcibios_penalize_isa_irq(int irq, int active)
  * Allocated Resources
  */
 
-static void pnpbios_parse_allocated_irqresource(struct pnp_resource_table *res,
-                                                int irq)
+static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,
+                                               int start, int len)
 {
-        int i = 0;
-
-        while (!(res->irq_resource[i].flags & IORESOURCE_UNSET)
-               && i < PNP_MAX_IRQ)
-                i++;
-        if (i < PNP_MAX_IRQ) {
-                res->irq_resource[i].flags = IORESOURCE_IRQ;    // Also clears _UNSET flag
-                if (irq == -1) {
-                        res->irq_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->irq_resource[i].start =
-                    res->irq_resource[i].end = (unsigned long)irq;
-                pcibios_penalize_isa_irq(irq, 1);
-        }
-}
+        int flags = 0;
+        int end = start + len - 1;
 
-static void pnpbios_parse_allocated_dmaresource(struct pnp_resource_table *res,
-                                                int dma)
-{
-        int i = 0;
-
-        while (i < PNP_MAX_DMA &&
-               !(res->dma_resource[i].flags & IORESOURCE_UNSET))
-                i++;
-        if (i < PNP_MAX_DMA) {
-                res->dma_resource[i].flags = IORESOURCE_DMA;    // Also clears _UNSET flag
-                if (dma == -1) {
-                        res->dma_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->dma_resource[i].start =
-                    res->dma_resource[i].end = (unsigned long)dma;
-        }
-}
+        if (len <= 0 || end >= 0x10003)
+                flags |= IORESOURCE_DISABLED;
 
-static void pnpbios_parse_allocated_ioresource(struct pnp_resource_table *res,
-                                               int io, int len)
-{
-        int i = 0;
-
-        while (!(res->port_resource[i].flags & IORESOURCE_UNSET)
-               && i < PNP_MAX_PORT)
-                i++;
-        if (i < PNP_MAX_PORT) {
-                res->port_resource[i].flags = IORESOURCE_IO;    // Also clears _UNSET flag
-                if (len <= 0 || (io + len - 1) >= 0x10003) {
-                        res->port_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->port_resource[i].start = (unsigned long)io;
-                res->port_resource[i].end = (unsigned long)(io + len - 1);
-        }
+        pnp_add_io_resource(dev, start, end, flags);
 }
 
-static void pnpbios_parse_allocated_memresource(struct pnp_resource_table *res,
-                                                int mem, int len)
+static void pnpbios_parse_allocated_memresource(struct pnp_dev *dev,
+                                                int start, int len)
 {
-        int i = 0;
-
-        while (!(res->mem_resource[i].flags & IORESOURCE_UNSET)
-               && i < PNP_MAX_MEM)
-                i++;
-        if (i < PNP_MAX_MEM) {
-                res->mem_resource[i].flags = IORESOURCE_MEM;    // Also clears _UNSET flag
-                if (len <= 0) {
-                        res->mem_resource[i].flags |= IORESOURCE_DISABLED;
-                        return;
-                }
-                res->mem_resource[i].start = (unsigned long)mem;
-                res->mem_resource[i].end = (unsigned long)(mem + len - 1);
-        }
+        int flags = 0;
+        int end = start + len - 1;
+
+        if (len <= 0)
+                flags |= IORESOURCE_DISABLED;
+
+        pnp_add_mem_resource(dev, start, end, flags);
 }
 
-static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
-                                                            unsigned char *end,
-                                                            struct
-                                                            pnp_resource_table
-                                                            *res)
+static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
+                                                            unsigned char *p,
+                                                            unsigned char *end)
 {
         unsigned int len, tag;
-        int io, size, mask, i;
+        int io, size, mask, i, flags;
 
         if (!p)
                 return NULL;
 
-        /* Blank the resource table values */
-        pnp_init_resource_table(res);
+        dev_dbg(&dev->dev, "parse allocated resources\n");
+
+        pnp_init_resources(dev);
 
         while ((char *)p < (char *)end) {
 
@@ -163,7 +109,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                                 goto len_err;
                         io = *(short *)&p[4];
                         size = *(short *)&p[10];
-                        pnpbios_parse_allocated_memresource(res, io, size);
+                        pnpbios_parse_allocated_memresource(dev, io, size);
                         break;
 
                 case LARGE_TAG_ANSISTR:
@@ -179,7 +125,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                                 goto len_err;
                         io = *(int *)&p[4];
                         size = *(int *)&p[16];
-                        pnpbios_parse_allocated_memresource(res, io, size);
+                        pnpbios_parse_allocated_memresource(dev, io, size);
                         break;
 
                 case LARGE_TAG_FIXEDMEM32:
@@ -187,29 +133,37 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                                 goto len_err;
                         io = *(int *)&p[4];
                         size = *(int *)&p[8];
-                        pnpbios_parse_allocated_memresource(res, io, size);
+                        pnpbios_parse_allocated_memresource(dev, io, size);
                         break;
 
                 case SMALL_TAG_IRQ:
                         if (len < 2 || len > 3)
                                 goto len_err;
+                        flags = 0;
                         io = -1;
                         mask = p[1] + p[2] * 256;
                         for (i = 0; i < 16; i++, mask = mask >> 1)
                                 if (mask & 0x01)
                                         io = i;
-                        pnpbios_parse_allocated_irqresource(res, io);
+                        if (io != -1)
+                                pcibios_penalize_isa_irq(io, 1);
+                        else
+                                flags = IORESOURCE_DISABLED;
+                        pnp_add_irq_resource(dev, io, flags);
                         break;
 
                 case SMALL_TAG_DMA:
                         if (len != 2)
                                 goto len_err;
+                        flags = 0;
                         io = -1;
                         mask = p[1];
                         for (i = 0; i < 8; i++, mask = mask >> 1)
                                 if (mask & 0x01)
                                         io = i;
-                        pnpbios_parse_allocated_dmaresource(res, io);
+                        if (io == -1)
+                                flags = IORESOURCE_DISABLED;
+                        pnp_add_dma_resource(dev, io, flags);
                         break;
 
                 case SMALL_TAG_PORT:
@@ -217,7 +171,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                                 goto len_err;
                         io = p[2] + p[3] * 256;
                         size = p[7];
-                        pnpbios_parse_allocated_ioresource(res, io, size);
+                        pnpbios_parse_allocated_ioresource(dev, io, size);
                         break;
 
                 case SMALL_TAG_VENDOR:
@@ -229,7 +183,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                                 goto len_err;
                         io = p[1] + p[2] * 256;
                         size = p[3];
-                        pnpbios_parse_allocated_ioresource(res, io, size);
+                        pnpbios_parse_allocated_ioresource(dev, io, size);
                         break;
 
                 case SMALL_TAG_END:
@@ -239,9 +193,8 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
 
                 default:        /* an unkown tag */
 len_err:
-                        printk(KERN_ERR
-                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                               tag, len);
+                        dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                                tag, len);
                         break;
                 }
 
@@ -252,8 +205,7 @@ len_err:
                         p += len + 1;
         }
 
-        printk(KERN_ERR
-               "PnPBIOS: Resource structure does not contain an end tag.\n");
+        dev_err(&dev->dev, "no end tag in resource structure\n");
 
         return NULL;
 }
@@ -262,7 +214,8 @@ len_err:
  * Resource Configuration Options
  */
 
-static __init void pnpbios_parse_mem_option(unsigned char *p, int size,
+static __init void pnpbios_parse_mem_option(struct pnp_dev *dev,
+                                            unsigned char *p, int size,
                                             struct pnp_option *option)
 {
         struct pnp_mem *mem;
@@ -275,10 +228,11 @@ static __init void pnpbios_parse_mem_option(unsigned char *p, int size,
         mem->align = (p[9] << 8) | p[8];
         mem->size = ((p[11] << 8) | p[10]) << 8;
         mem->flags = p[3];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpbios_parse_mem32_option(unsigned char *p, int size,
+static __init void pnpbios_parse_mem32_option(struct pnp_dev *dev,
+                                              unsigned char *p, int size,
                                               struct pnp_option *option)
 {
         struct pnp_mem *mem;
@@ -291,10 +245,11 @@ static __init void pnpbios_parse_mem32_option(unsigned char *p, int size,
         mem->align = (p[15] << 24) | (p[14] << 16) | (p[13] << 8) | p[12];
         mem->size = (p[19] << 24) | (p[18] << 16) | (p[17] << 8) | p[16];
         mem->flags = p[3];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
+static __init void pnpbios_parse_fixed_mem32_option(struct pnp_dev *dev,
+                                                    unsigned char *p, int size,
                                                     struct pnp_option *option)
 {
         struct pnp_mem *mem;
@@ -306,11 +261,12 @@ static __init void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
         mem->size = (p[11] << 24) | (p[10] << 16) | (p[9] << 8) | p[8];
         mem->align = 0;
         mem->flags = p[3];
-        pnp_register_mem_resource(option, mem);
+        pnp_register_mem_resource(dev, option, mem);
 }
 
-static __init void pnpbios_parse_irq_option(unsigned char *p, int size,
-                                     struct pnp_option *option)
+static __init void pnpbios_parse_irq_option(struct pnp_dev *dev,
+                                            unsigned char *p, int size,
+                                            struct pnp_option *option)
 {
         struct pnp_irq *irq;
         unsigned long bits;
@@ -324,11 +280,12 @@ static __init void pnpbios_parse_irq_option(unsigned char *p, int size,
                 irq->flags = p[3];
         else
                 irq->flags = IORESOURCE_IRQ_HIGHEDGE;
-        pnp_register_irq_resource(option, irq);
+        pnp_register_irq_resource(dev, option, irq);
 }
 
-static __init void pnpbios_parse_dma_option(unsigned char *p, int size,
-                                     struct pnp_option *option)
+static __init void pnpbios_parse_dma_option(struct pnp_dev *dev,
+                                            unsigned char *p, int size,
+                                            struct pnp_option *option)
 {
         struct pnp_dma *dma;
 
@@ -337,10 +294,11 @@ static __init void pnpbios_parse_dma_option(unsigned char *p, int size,
                 return;
         dma->map = p[1];
         dma->flags = p[2];
-        pnp_register_dma_resource(option, dma);
+        pnp_register_dma_resource(dev, option, dma);
 }
 
-static __init void pnpbios_parse_port_option(unsigned char *p, int size,
+static __init void pnpbios_parse_port_option(struct pnp_dev *dev,
+                                             unsigned char *p, int size,
                                              struct pnp_option *option)
 {
         struct pnp_port *port;
@@ -353,10 +311,11 @@ static __init void pnpbios_parse_port_option(unsigned char *p, int size,
         port->align = p[6];
         port->size = p[7];
         port->flags = p[1] ? PNP_PORT_FLAG_16BITADDR : 0;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
-static __init void pnpbios_parse_fixed_port_option(unsigned char *p, int size,
+static __init void pnpbios_parse_fixed_port_option(struct pnp_dev *dev,
+                                                   unsigned char *p, int size,
                                                    struct pnp_option *option)
 {
         struct pnp_port *port;
@@ -368,7 +327,7 @@ static __init void pnpbios_parse_fixed_port_option(unsigned char *p, int size,
         port->size = p[3];
         port->align = 0;
         port->flags = PNP_PORT_FLAG_FIXED;
-        pnp_register_port_resource(option, port);
+        pnp_register_port_resource(dev, option, port);
 }
 
 static __init unsigned char *
@@ -382,6 +341,8 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
         if (!p)
                 return NULL;
 
+        dev_dbg(&dev->dev, "parse resource options\n");
+
         option_independent = option = pnp_register_independent_option(dev);
         if (!option)
                 return NULL;
@@ -402,37 +363,37 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                 case LARGE_TAG_MEM:
                         if (len != 9)
                                 goto len_err;
-                        pnpbios_parse_mem_option(p, len, option);
+                        pnpbios_parse_mem_option(dev, p, len, option);
                         break;
 
                 case LARGE_TAG_MEM32:
                         if (len != 17)
                                 goto len_err;
-                        pnpbios_parse_mem32_option(p, len, option);
+                        pnpbios_parse_mem32_option(dev, p, len, option);
                         break;
 
                 case LARGE_TAG_FIXEDMEM32:
                         if (len != 9)
                                 goto len_err;
-                        pnpbios_parse_fixed_mem32_option(p, len, option);
+                        pnpbios_parse_fixed_mem32_option(dev, p, len, option);
                         break;
 
                 case SMALL_TAG_IRQ:
                         if (len < 2 || len > 3)
                                 goto len_err;
-                        pnpbios_parse_irq_option(p, len, option);
+                        pnpbios_parse_irq_option(dev, p, len, option);
                         break;
 
                 case SMALL_TAG_DMA:
                         if (len != 2)
                                 goto len_err;
-                        pnpbios_parse_dma_option(p, len, option);
+                        pnpbios_parse_dma_option(dev, p, len, option);
                         break;
 
                 case SMALL_TAG_PORT:
                         if (len != 7)
                                 goto len_err;
-                        pnpbios_parse_port_option(p, len, option);
+                        pnpbios_parse_port_option(dev, p, len, option);
                         break;
 
                 case SMALL_TAG_VENDOR:
@@ -442,7 +403,7 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                 case SMALL_TAG_FIXEDPORT:
                         if (len != 3)
                                 goto len_err;
-                        pnpbios_parse_fixed_port_option(p, len, option);
+                        pnpbios_parse_fixed_port_option(dev, p, len, option);
                         break;
 
                 case SMALL_TAG_STARTDEP:
@@ -460,9 +421,10 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                         if (len != 0)
                                 goto len_err;
                         if (option_independent == option)
-                                printk(KERN_WARNING
-                                       "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n");
+                                dev_warn(&dev->dev, "missing "
+                                         "SMALL_TAG_STARTDEP tag\n");
                         option = option_independent;
+                        dev_dbg(&dev->dev, "end dependent options\n");
                         break;
 
                 case SMALL_TAG_END:
@@ -470,9 +432,8 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
 
                 default:        /* an unkown tag */
 len_err:
-                        printk(KERN_ERR
-                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                               tag, len);
+                        dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                                tag, len);
                         break;
                 }
 
@@ -483,8 +444,7 @@ len_err:
                         p += len + 1;
         }
 
-        printk(KERN_ERR
-               "PnPBIOS: Resource structure does not contain an end tag.\n");
+        dev_err(&dev->dev, "no end tag in resource structure\n");
 
         return NULL;
 }
@@ -493,32 +453,12 @@ len_err:
  * Compatible Device IDs
  */
 
-#define HEX(id,a) hex[((id)>>a) & 15]
-#define CHAR(id,a) (0x40 + (((id)>>a) & 31))
-
-void pnpid32_to_pnpid(u32 id, char *str)
-{
-        const char *hex = "0123456789abcdef";
-
-        id = be32_to_cpu(id);
-        str[0] = CHAR(id, 26);
-        str[1] = CHAR(id, 21);
-        str[2] = CHAR(id, 16);
-        str[3] = HEX(id, 12);
-        str[4] = HEX(id, 8);
-        str[5] = HEX(id, 4);
-        str[6] = HEX(id, 0);
-        str[7] = '\0';
-}
-
-#undef CHAR
-#undef HEX
-
 static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
                                                    unsigned char *end,
                                                    struct pnp_dev *dev)
 {
         int len, tag;
+        u32 eisa_id;
         char id[8];
         struct pnp_id *dev_id;
 
@@ -548,13 +488,11 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
                 case SMALL_TAG_COMPATDEVID:     /* compatible ID */
                         if (len != 4)
                                 goto len_err;
-                        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+                        eisa_id = p[1] | p[2] << 8 | p[3] << 16 | p[4] << 24;
+                        pnp_eisa_id_to_string(eisa_id & PNP_EISA_ID_MASK, id);
+                        dev_id = pnp_add_id(dev, id);
                         if (!dev_id)
                                 return NULL;
-                        pnpid32_to_pnpid(p[1] | p[2] << 8 | p[3] << 16 | p[4] <<
-                                         24, id);
-                        memcpy(&dev_id->id, id, 7);
-                        pnp_add_id(dev_id, dev);
                         break;
 
                 case SMALL_TAG_END:
@@ -564,9 +502,8 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
 
                 default:        /* an unkown tag */
 len_err:
-                        printk(KERN_ERR
-                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                               tag, len);
+                        dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                                tag, len);
                         break;
                 }
 
@@ -577,8 +514,7 @@ len_err:
                         p += len + 1;
         }
 
-        printk(KERN_ERR
-               "PnPBIOS: Resource structure does not contain an end tag.\n");
+        dev_err(&dev->dev, "no end tag in resource structure\n");
 
         return NULL;
 }
@@ -587,7 +523,8 @@ len_err:
  * Allocated Resource Encoding
  */
 
-static void pnpbios_encode_mem(unsigned char *p, struct resource *res)
+static void pnpbios_encode_mem(struct pnp_dev *dev, unsigned char *p,
+                               struct resource *res)
 {
         unsigned long base = res->start;
         unsigned long len = res->end - res->start + 1;
@@ -598,9 +535,13 @@ static void pnpbios_encode_mem(unsigned char *p, struct resource *res)
         p[7] = ((base >> 8) >> 8) & 0xff;
         p[10] = (len >> 8) & 0xff;
         p[11] = ((len >> 8) >> 8) & 0xff;
+
+        dev_dbg(&dev->dev, "  encode mem %#llx-%#llx\n",
+                (unsigned long long) res->start, (unsigned long long) res->end);
 }
 
-static void pnpbios_encode_mem32(unsigned char *p, struct resource *res)
+static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p,
+                                 struct resource *res)
 {
         unsigned long base = res->start;
         unsigned long len = res->end - res->start + 1;
@@ -617,9 +558,13 @@ static void pnpbios_encode_mem32(unsigned char *p, struct resource *res)
         p[17] = (len >> 8) & 0xff;
         p[18] = (len >> 16) & 0xff;
         p[19] = (len >> 24) & 0xff;
+
+        dev_dbg(&dev->dev, "  encode mem32 %#llx-%#llx\n",
+                (unsigned long long) res->start, (unsigned long long) res->end);
 }
 
-static void pnpbios_encode_fixed_mem32(unsigned char *p, struct resource *res)
+static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p,
+                                       struct resource *res)
 {
         unsigned long base = res->start;
         unsigned long len = res->end - res->start + 1;
@@ -632,26 +577,36 @@ static void pnpbios_encode_fixed_mem32(unsigned char *p, struct resource *res)
         p[9] = (len >> 8) & 0xff;
         p[10] = (len >> 16) & 0xff;
         p[11] = (len >> 24) & 0xff;
+
+        dev_dbg(&dev->dev, "  encode fixed_mem32 %#llx-%#llx\n",
+                (unsigned long long) res->start, (unsigned long long) res->end);
 }
 
-static void pnpbios_encode_irq(unsigned char *p, struct resource *res)
+static void pnpbios_encode_irq(struct pnp_dev *dev, unsigned char *p,
+                               struct resource *res)
 {
         unsigned long map = 0;
 
         map = 1 << res->start;
         p[1] = map & 0xff;
         p[2] = (map >> 8) & 0xff;
+
+        dev_dbg(&dev->dev, "  encode irq %d\n", res->start);
 }
 
-static void pnpbios_encode_dma(unsigned char *p, struct resource *res)
+static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p,
+                               struct resource *res)
 {
         unsigned long map = 0;
 
         map = 1 << res->start;
         p[1] = map & 0xff;
+
+        dev_dbg(&dev->dev, "  encode dma %d\n", res->start);
 }
 
-static void pnpbios_encode_port(unsigned char *p, struct resource *res)
+static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,
+                                struct resource *res)
 {
         unsigned long base = res->start;
         unsigned long len = res->end - res->start + 1;
@@ -661,9 +616,13 @@ static void pnpbios_encode_port(unsigned char *p, struct resource *res)
         p[4] = base & 0xff;
         p[5] = (base >> 8) & 0xff;
         p[7] = len & 0xff;
+
+        dev_dbg(&dev->dev, "  encode io %#llx-%#llx\n",
+                (unsigned long long) res->start, (unsigned long long) res->end);
 }
 
-static void pnpbios_encode_fixed_port(unsigned char *p, struct resource *res)
+static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p,
+                                      struct resource *res)
 {
         unsigned long base = res->start;
         unsigned long len = res->end - res->start + 1;
@@ -671,13 +630,15 @@ static void pnpbios_encode_fixed_port(unsigned char *p, struct resource *res)
         p[1] = base & 0xff;
         p[2] = (base >> 8) & 0xff;
         p[3] = len & 0xff;
+
+        dev_dbg(&dev->dev, "  encode fixed_io %#llx-%#llx\n",
+                (unsigned long long) res->start, (unsigned long long) res->end);
 }
 
-static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
-                                                             unsigned char *end,
-                                                             struct
-                                                             pnp_resource_table
-                                                             *res)
+static unsigned char *pnpbios_encode_allocated_resource_data(struct pnp_dev
+                                                                *dev,
+                                                             unsigned char *p,
+                                                             unsigned char *end)
 {
         unsigned int len, tag;
         int port = 0, irq = 0, dma = 0, mem = 0;
@@ -701,42 +662,48 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
                 case LARGE_TAG_MEM:
                         if (len != 9)
                                 goto len_err;
-                        pnpbios_encode_mem(p, &res->mem_resource[mem]);
+                        pnpbios_encode_mem(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
 
                 case LARGE_TAG_MEM32:
                         if (len != 17)
                                 goto len_err;
-                        pnpbios_encode_mem32(p, &res->mem_resource[mem]);
+                        pnpbios_encode_mem32(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
 
                 case LARGE_TAG_FIXEDMEM32:
                         if (len != 9)
                                 goto len_err;
-                        pnpbios_encode_fixed_mem32(p, &res->mem_resource[mem]);
+                        pnpbios_encode_fixed_mem32(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_MEM, mem));
                         mem++;
                         break;
 
                 case SMALL_TAG_IRQ:
                         if (len < 2 || len > 3)
                                 goto len_err;
-                        pnpbios_encode_irq(p, &res->irq_resource[irq]);
+                        pnpbios_encode_irq(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_IRQ, irq));
                         irq++;
                         break;
 
                 case SMALL_TAG_DMA:
                         if (len != 2)
                                 goto len_err;
-                        pnpbios_encode_dma(p, &res->dma_resource[dma]);
+                        pnpbios_encode_dma(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_DMA, dma));
                         dma++;
                         break;
 
                 case SMALL_TAG_PORT:
                         if (len != 7)
                                 goto len_err;
-                        pnpbios_encode_port(p, &res->port_resource[port]);
+                        pnpbios_encode_port(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_IO, port));
                         port++;
                         break;
 
@@ -747,7 +714,8 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
                 case SMALL_TAG_FIXEDPORT:
                         if (len != 3)
                                 goto len_err;
-                        pnpbios_encode_fixed_port(p, &res->port_resource[port]);
+                        pnpbios_encode_fixed_port(dev, p,
+                                pnp_get_resource(dev, IORESOURCE_IO, port));
                         port++;
                         break;
 
@@ -758,9 +726,8 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
 
                 default:        /* an unkown tag */
 len_err:
-                        printk(KERN_ERR
-                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                               tag, len);
+                        dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                                tag, len);
                         break;
                 }
 
@@ -771,8 +738,7 @@ len_err:
                         p += len + 1;
         }
 
-        printk(KERN_ERR
-               "PnPBIOS: Resource structure does not contain an end tag.\n");
+        dev_err(&dev->dev, "no end tag in resource structure\n");
 
         return NULL;
 }
@@ -787,7 +753,7 @@ int __init pnpbios_parse_data_stream(struct pnp_dev *dev,
         unsigned char *p = (char *)node->data;
         unsigned char *end = (char *)(node->data + node->size);
 
-        p = pnpbios_parse_allocated_resource_data(p, end, &dev->res);
+        p = pnpbios_parse_allocated_resource_data(dev, p, end);
         if (!p)
                 return -EIO;
         p = pnpbios_parse_resource_option_data(p, end, dev);
@@ -799,25 +765,25 @@ int __init pnpbios_parse_data_stream(struct pnp_dev *dev,
         return 0;
 }
 
-int pnpbios_read_resources_from_node(struct pnp_resource_table *res,
+int pnpbios_read_resources_from_node(struct pnp_dev *dev,
                                      struct pnp_bios_node *node)
 {
         unsigned char *p = (char *)node->data;
         unsigned char *end = (char *)(node->data + node->size);
 
-        p = pnpbios_parse_allocated_resource_data(p, end, res);
+        p = pnpbios_parse_allocated_resource_data(dev, p, end);
         if (!p)
                 return -EIO;
         return 0;
 }
 
-int pnpbios_write_resources_to_node(struct pnp_resource_table *res,
+int pnpbios_write_resources_to_node(struct pnp_dev *dev,
                                     struct pnp_bios_node *node)
 {
         unsigned char *p = (char *)node->data;
         unsigned char *end = (char *)(node->data + node->size);
 
-        p = pnpbios_encode_allocated_resource_data(p, end, res);
+        p = pnpbios_encode_allocated_resource_data(dev, p, end);
         if (!p)
                 return -EIO;
         return 0;
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index e4daf4635c48..d049a2279fea 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -117,6 +117,7 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
 static void quirk_system_pci_resources(struct pnp_dev *dev)
 {
         struct pci_dev *pdev = NULL;
+        struct resource *res;
         resource_size_t pnp_start, pnp_end, pci_start, pci_end;
         int i, j;
 
@@ -137,13 +138,15 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
 
                         pci_start = pci_resource_start(pdev, i);
                         pci_end = pci_resource_end(pdev, i);
-                        for (j = 0; j < PNP_MAX_MEM; j++) {
-                                if (!pnp_mem_valid(dev, j) ||
-                                    pnp_mem_len(dev, j) == 0)
+                        for (j = 0;
+                             (res = pnp_get_resource(dev, IORESOURCE_MEM, j));
+                             j++) {
+                                if (res->flags & IORESOURCE_UNSET ||
+                                    (res->start == 0 && res->end == 0))
                                         continue;
 
-                                pnp_start = pnp_mem_start(dev, j);
-                                pnp_end = pnp_mem_end(dev, j);
+                                pnp_start = res->start;
+                                pnp_end = res->end;
 
                                 /*
                                  * If the PNP region doesn't overlap the PCI
@@ -176,7 +179,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
                                         pci_name(pdev), i,
                                         (unsigned long long) pci_start,
                                         (unsigned long long) pci_end);
-                                pnp_mem_flags(dev, j) = 0;
+                                res->flags = 0;
                         }
                 }
         }
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index e50ebcffb962..2041620d5682 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -53,6 +53,8 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
         if (dev->independent)
                 dev_err(&dev->dev, "independent resource already registered\n");
         dev->independent = option;
+
+        dev_dbg(&dev->dev, "new independent option\n");
         return option;
 }
 
@@ -70,12 +72,18 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
                 parent->next = option;
         } else
                 dev->dependent = option;
+
+        dev_dbg(&dev->dev, "new dependent option (priority %#x)\n", priority);
         return option;
 }
 
-int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
+int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_irq *data)
 {
         struct pnp_irq *ptr;
+#ifdef DEBUG
+        char buf[PNP_IRQ_NR];   /* hex-encoded, so this is overkill but safe */
+#endif
 
         ptr = option->irq;
         while (ptr && ptr->next)
@@ -94,10 +102,17 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
                                 pcibios_penalize_isa_irq(i, 0);
         }
 #endif
+
+#ifdef DEBUG
+        bitmap_scnprintf(buf, sizeof(buf), data->map, PNP_IRQ_NR);
+        dev_dbg(&dev->dev, "  irq bitmask %s flags %#x\n", buf,
+                data->flags);
+#endif
         return 0;
 }
 
-int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
+int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_dma *data)
 {
         struct pnp_dma *ptr;
 
@@ -109,10 +124,13 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
         else
                 option->dma = data;
 
+        dev_dbg(&dev->dev, "  dma bitmask %#x flags %#x\n", data->map,
+                data->flags);
         return 0;
 }
 
-int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
+int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
+                               struct pnp_port *data)
 {
         struct pnp_port *ptr;
 
@@ -124,10 +142,14 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
         else
                 option->port = data;
 
+        dev_dbg(&dev->dev, "  io  "
+                "min %#x max %#x align %d size %d flags %#x\n",
+                data->min, data->max, data->align, data->size, data->flags);
         return 0;
 }
 
-int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
+int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
+                              struct pnp_mem *data)
 {
         struct pnp_mem *ptr;
 
@@ -138,6 +160,10 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
                 ptr->next = data;
         else
                 option->mem = data;
+
+        dev_dbg(&dev->dev, "  mem "
+                "min %#x max %#x align %d size %d flags %#x\n",
+                data->min, data->max, data->align, data->size, data->flags);
         return 0;
 }
 
@@ -213,17 +239,18 @@ void pnp_free_option(struct pnp_option *option)
 #define cannot_compare(flags) \
 ((flags) & (IORESOURCE_UNSET | IORESOURCE_DISABLED))
 
-int pnp_check_port(struct pnp_dev *dev, int idx)
+int pnp_check_port(struct pnp_dev *dev, struct resource *res)
 {
-        int tmp;
+        int i;
         struct pnp_dev *tdev;
+        struct resource *tres;
         resource_size_t *port, *end, *tport, *tend;
 
-        port = &dev->res.port_resource[idx].start;
-        end = &dev->res.port_resource[idx].end;
+        port = &res->start;
+        end = &res->end;
 
         /* if the resource doesn't exist, don't complain about it */
-        if (cannot_compare(dev->res.port_resource[idx].flags))
+        if (cannot_compare(res->flags))
                 return 1;
 
         /* check if the resource is already in use, skip if the
@@ -234,18 +261,18 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
         }
 
         /* check if the resource is reserved */
-        for (tmp = 0; tmp < 8; tmp++) {
-                int rport = pnp_reserve_io[tmp << 1];
-                int rend = pnp_reserve_io[(tmp << 1) + 1] + rport - 1;
+        for (i = 0; i < 8; i++) {
+                int rport = pnp_reserve_io[i << 1];
+                int rend = pnp_reserve_io[(i << 1) + 1] + rport - 1;
                 if (ranged_conflict(port, end, &rport, &rend))
                         return 0;
         }
 
         /* check for internal conflicts */
-        for (tmp = 0; tmp < PNP_MAX_PORT && tmp != idx; tmp++) {
-                if (dev->res.port_resource[tmp].flags & IORESOURCE_IO) {
-                        tport = &dev->res.port_resource[tmp].start;
-                        tend = &dev->res.port_resource[tmp].end;
+        for (i = 0; (tres = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+                if (tres != res && tres->flags & IORESOURCE_IO) {
+                        tport = &tres->start;
+                        tend = &tres->end;
                         if (ranged_conflict(port, end, tport, tend))
                                 return 0;
                 }
@@ -255,13 +282,14 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
         pnp_for_each_dev(tdev) {
                 if (tdev == dev)
                         continue;
-                for (tmp = 0; tmp < PNP_MAX_PORT; tmp++) {
-                        if (tdev->res.port_resource[tmp].flags & IORESOURCE_IO) {
-                                if (cannot_compare
-                                    (tdev->res.port_resource[tmp].flags))
+                for (i = 0;
+                     (tres = pnp_get_resource(tdev, IORESOURCE_IO, i));
+                     i++) {
+                        if (tres->flags & IORESOURCE_IO) {
+                                if (cannot_compare(tres->flags))
                                         continue;
-                                tport = &tdev->res.port_resource[tmp].start;
-                                tend = &tdev->res.port_resource[tmp].end;
+                                tport = &tres->start;
+                                tend = &tres->end;
                                 if (ranged_conflict(port, end, tport, tend))
                                         return 0;
                         }
@@ -271,17 +299,18 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
         return 1;
 }
 
-int pnp_check_mem(struct pnp_dev *dev, int idx)
+int pnp_check_mem(struct pnp_dev *dev, struct resource *res)
 {
-        int tmp;
+        int i;
         struct pnp_dev *tdev;
+        struct resource *tres;
         resource_size_t *addr, *end, *taddr, *tend;
 
-        addr = &dev->res.mem_resource[idx].start;
-        end = &dev->res.mem_resource[idx].end;
+        addr = &res->start;
+        end = &res->end;
 
         /* if the resource doesn't exist, don't complain about it */
-        if (cannot_compare(dev->res.mem_resource[idx].flags))
+        if (cannot_compare(res->flags))
                 return 1;
 
         /* check if the resource is already in use, skip if the
@@ -292,18 +321,18 @@ int pnp_check_mem(struct pnp_dev *dev, int idx)
         }
 
         /* check if the resource is reserved */
-        for (tmp = 0; tmp < 8; tmp++) {
-                int raddr = pnp_reserve_mem[tmp << 1];
-                int rend = pnp_reserve_mem[(tmp << 1) + 1] + raddr - 1;
+        for (i = 0; i < 8; i++) {
+                int raddr = pnp_reserve_mem[i << 1];
+                int rend = pnp_reserve_mem[(i << 1) + 1] + raddr - 1;
                 if (ranged_conflict(addr, end, &raddr, &rend))
                         return 0;
         }
 
         /* check for internal conflicts */
-        for (tmp = 0; tmp < PNP_MAX_MEM && tmp != idx; tmp++) {
-                if (dev->res.mem_resource[tmp].flags & IORESOURCE_MEM) {
-                        taddr = &dev->res.mem_resource[tmp].start;
-                        tend = &dev->res.mem_resource[tmp].end;
+        for (i = 0; (tres = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
+                if (tres != res && tres->flags & IORESOURCE_MEM) {
+                        taddr = &tres->start;
+                        tend = &tres->end;
                         if (ranged_conflict(addr, end, taddr, tend))
                                 return 0;
                 }
@@ -313,13 +342,14 @@ int pnp_check_mem(struct pnp_dev *dev, int idx)
         pnp_for_each_dev(tdev) {
                 if (tdev == dev)
                         continue;
-                for (tmp = 0; tmp < PNP_MAX_MEM; tmp++) {
-                        if (tdev->res.mem_resource[tmp].flags & IORESOURCE_MEM) {
-                                if (cannot_compare
-                                    (tdev->res.mem_resource[tmp].flags))
+                for (i = 0;
+                     (tres = pnp_get_resource(tdev, IORESOURCE_MEM, i));
+                     i++) {
+                        if (tres->flags & IORESOURCE_MEM) {
+                                if (cannot_compare(tres->flags))
                                         continue;
-                                taddr = &tdev->res.mem_resource[tmp].start;
-                                tend = &tdev->res.mem_resource[tmp].end;
+                                taddr = &tres->start;
+                                tend = &tres->end;
                                 if (ranged_conflict(addr, end, taddr, tend))
                                         return 0;
                         }
@@ -334,14 +364,17 @@ static irqreturn_t pnp_test_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-int pnp_check_irq(struct pnp_dev *dev, int idx)
+int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
 {
-        int tmp;
+        int i;
         struct pnp_dev *tdev;
-        resource_size_t *irq = &dev->res.irq_resource[idx].start;
+        struct resource *tres;
+        resource_size_t *irq;
+
+        irq = &res->start;
 
         /* if the resource doesn't exist, don't complain about it */
-        if (cannot_compare(dev->res.irq_resource[idx].flags))
+        if (cannot_compare(res->flags))
                 return 1;
 
         /* check if the resource is valid */
@@ -349,15 +382,15 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
                 return 0;
 
         /* check if the resource is reserved */
-        for (tmp = 0; tmp < 16; tmp++) {
-                if (pnp_reserve_irq[tmp] == *irq)
+        for (i = 0; i < 16; i++) {
+                if (pnp_reserve_irq[i] == *irq)
                         return 0;
         }
 
         /* check for internal conflicts */
-        for (tmp = 0; tmp < PNP_MAX_IRQ && tmp != idx; tmp++) {
-                if (dev->res.irq_resource[tmp].flags & IORESOURCE_IRQ) {
-                        if (dev->res.irq_resource[tmp].start == *irq)
+        for (i = 0; (tres = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) {
+                if (tres != res && tres->flags & IORESOURCE_IRQ) {
+                        if (tres->start == *irq)
                                 return 0;
                 }
         }
@@ -388,12 +421,13 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
         pnp_for_each_dev(tdev) {
                 if (tdev == dev)
                         continue;
-                for (tmp = 0; tmp < PNP_MAX_IRQ; tmp++) {
-                        if (tdev->res.irq_resource[tmp].flags & IORESOURCE_IRQ) {
-                                if (cannot_compare
-                                    (tdev->res.irq_resource[tmp].flags))
+                for (i = 0;
+                     (tres = pnp_get_resource(tdev, IORESOURCE_IRQ, i));
+                     i++) {
+                        if (tres->flags & IORESOURCE_IRQ) {
+                                if (cannot_compare(tres->flags))
                                         continue;
-                                if ((tdev->res.irq_resource[tmp].start == *irq))
+                                if (tres->start == *irq)
                                         return 0;
                         }
                 }
@@ -402,15 +436,18 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
         return 1;
 }
 
-int pnp_check_dma(struct pnp_dev *dev, int idx)
+int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 {
 #ifndef CONFIG_IA64
-        int tmp;
+        int i;
         struct pnp_dev *tdev;
-        resource_size_t *dma = &dev->res.dma_resource[idx].start;
+        struct resource *tres;
+        resource_size_t *dma;
+
+        dma = &res->start;
 
         /* if the resource doesn't exist, don't complain about it */
-        if (cannot_compare(dev->res.dma_resource[idx].flags))
+        if (cannot_compare(res->flags))
                 return 1;
 
         /* check if the resource is valid */
@@ -418,15 +455,15 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
                 return 0;
 
         /* check if the resource is reserved */
-        for (tmp = 0; tmp < 8; tmp++) {
-                if (pnp_reserve_dma[tmp] == *dma)
+        for (i = 0; i < 8; i++) {
+                if (pnp_reserve_dma[i] == *dma)
                         return 0;
         }
 
         /* check for internal conflicts */
-        for (tmp = 0; tmp < PNP_MAX_DMA && tmp != idx; tmp++) {
-                if (dev->res.dma_resource[tmp].flags & IORESOURCE_DMA) {
-                        if (dev->res.dma_resource[tmp].start == *dma)
+        for (i = 0; (tres = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) {
+                if (tres != res && tres->flags & IORESOURCE_DMA) {
+                        if (tres->start == *dma)
                                 return 0;
                 }
         }
@@ -443,12 +480,13 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
         pnp_for_each_dev(tdev) {
                 if (tdev == dev)
                         continue;
-                for (tmp = 0; tmp < PNP_MAX_DMA; tmp++) {
-                        if (tdev->res.dma_resource[tmp].flags & IORESOURCE_DMA) {
-                                if (cannot_compare
-                                    (tdev->res.dma_resource[tmp].flags))
+                for (i = 0;
+                     (tres = pnp_get_resource(tdev, IORESOURCE_DMA, i));
+                     i++) {
+                        if (tres->flags & IORESOURCE_DMA) {
+                                if (cannot_compare(tres->flags))
                                         continue;
-                                if ((tdev->res.dma_resource[tmp].start == *dma))
+                                if (tres->start == *dma)
                                         return 0;
                         }
                 }
@@ -461,6 +499,193 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
 #endif
 }
 
+struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
+                                          unsigned int type, unsigned int num)
+{
+        struct pnp_resource_table *res = dev->res;
+
+        switch (type) {
+        case IORESOURCE_IO:
+                if (num >= PNP_MAX_PORT)
+                        return NULL;
+                return &res->port[num];
+        case IORESOURCE_MEM:
+                if (num >= PNP_MAX_MEM)
+                        return NULL;
+                return &res->mem[num];
+        case IORESOURCE_IRQ:
+                if (num >= PNP_MAX_IRQ)
+                        return NULL;
+                return &res->irq[num];
+        case IORESOURCE_DMA:
+                if (num >= PNP_MAX_DMA)
+                        return NULL;
+                return &res->dma[num];
+        }
+        return NULL;
+}
+
+struct resource *pnp_get_resource(struct pnp_dev *dev,
+                                  unsigned int type, unsigned int num)
+{
+        struct pnp_resource *pnp_res;
+
+        pnp_res = pnp_get_pnp_resource(dev, type, num);
+        if (pnp_res)
+                return &pnp_res->res;
+
+        return NULL;
+}
+EXPORT_SYMBOL(pnp_get_resource);
+
+static struct pnp_resource *pnp_new_resource(struct pnp_dev *dev, int type)
+{
+        struct pnp_resource *pnp_res;
+        int i;
+
+        switch (type) {
+        case IORESOURCE_IO:
+                for (i = 0; i < PNP_MAX_PORT; i++) {
+                        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, i);
+                        if (pnp_res && !pnp_resource_valid(&pnp_res->res))
+                                return pnp_res;
+                }
+                break;
+        case IORESOURCE_MEM:
+                for (i = 0; i < PNP_MAX_MEM; i++) {
+                        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, i);
+                        if (pnp_res && !pnp_resource_valid(&pnp_res->res))
+                                return pnp_res;
+                }
+                break;
+        case IORESOURCE_IRQ:
+                for (i = 0; i < PNP_MAX_IRQ; i++) {
+                        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, i);
+                        if (pnp_res && !pnp_resource_valid(&pnp_res->res))
+                                return pnp_res;
+                }
+                break;
+        case IORESOURCE_DMA:
+                for (i = 0; i < PNP_MAX_DMA; i++) {
+                        pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, i);
+                        if (pnp_res && !pnp_resource_valid(&pnp_res->res))
+                                return pnp_res;
+                }
+                break;
+        }
+        return NULL;
+}
+
+struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
+                                          int flags)
+{
+        struct pnp_resource *pnp_res;
+        struct resource *res;
+        static unsigned char warned;
+
+        pnp_res = pnp_new_resource(dev, IORESOURCE_IRQ);
+        if (!pnp_res) {
+                if (!warned) {
+                        dev_err(&dev->dev, "can't add resource for IRQ %d\n",
+                                irq);
+                        warned = 1;
+                }
+                return NULL;
+        }
+
+        res = &pnp_res->res;
+        res->flags = IORESOURCE_IRQ | flags;
+        res->start = irq;
+        res->end = irq;
+
+        dev_dbg(&dev->dev, "  add irq %d flags %#x\n", irq, flags);
+        return pnp_res;
+}
+
+struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
+                                          int flags)
+{
+        struct pnp_resource *pnp_res;
+        struct resource *res;
+        static unsigned char warned;
+
+        pnp_res = pnp_new_resource(dev, IORESOURCE_DMA);
+        if (!pnp_res) {
+                if (!warned) {
+                        dev_err(&dev->dev, "can't add resource for DMA %d\n",
+                                dma);
+                        warned = 1;
+                }
+                return NULL;
+        }
+
+        res = &pnp_res->res;
+        res->flags = IORESOURCE_DMA | flags;
+        res->start = dma;
+        res->end = dma;
+
+        dev_dbg(&dev->dev, "  add dma %d flags %#x\n", dma, flags);
+        return pnp_res;
+}
+
+struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
+                                         resource_size_t start,
+                                         resource_size_t end, int flags)
+{
+        struct pnp_resource *pnp_res;
+        struct resource *res;
+        static unsigned char warned;
+
+        pnp_res = pnp_new_resource(dev, IORESOURCE_IO);
+        if (!pnp_res) {
+                if (!warned) {
+                        dev_err(&dev->dev, "can't add resource for IO "
+                                "%#llx-%#llx\n",(unsigned long long) start,
+                                (unsigned long long) end);
+                        warned = 1;
+                }
+                return NULL;
+        }
+
+        res = &pnp_res->res;
+        res->flags = IORESOURCE_IO | flags;
+        res->start = start;
+        res->end = end;
+
+        dev_dbg(&dev->dev, "  add io  %#llx-%#llx flags %#x\n",
+                (unsigned long long) start, (unsigned long long) end, flags);
+        return pnp_res;
+}
+
+struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
+                                          resource_size_t start,
+                                          resource_size_t end, int flags)
+{
+        struct pnp_resource *pnp_res;
+        struct resource *res;
+        static unsigned char warned;
+
+        pnp_res = pnp_new_resource(dev, IORESOURCE_MEM);
+        if (!pnp_res) {
+                if (!warned) {
+                        dev_err(&dev->dev, "can't add resource for MEM "
+                                "%#llx-%#llx\n",(unsigned long long) start,
+                                (unsigned long long) end);
+                        warned = 1;
+                }
+                return NULL;
+        }
+
+        res = &pnp_res->res;
+        res->flags = IORESOURCE_MEM | flags;
+        res->start = start;
+        res->end = end;
+
+        dev_dbg(&dev->dev, "  add mem %#llx-%#llx flags %#x\n",
+                (unsigned long long) start, (unsigned long long) end, flags);
+        return pnp_res;
+}
+
 /* format is: pnp_reserve_irq=irq1[,irq2] .... */
 static int __init pnp_setup_reserve_irq(char *str)
 {
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 13c608f5fb30..3eba85ed729c 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -25,3 +25,66 @@ int pnp_is_active(struct pnp_dev *dev)
 }
 
 EXPORT_SYMBOL(pnp_is_active);
+
+/*
+ * Functionally similar to acpi_ex_eisa_id_to_string(), but that's
+ * buried in the ACPI CA, and we can't depend on it being present.
+ */
+void pnp_eisa_id_to_string(u32 id, char *str)
+{
+        id = be32_to_cpu(id);
+
+        /*
+         * According to the specs, the first three characters are five-bit
+         * compressed ASCII, and the left-over high order bit should be zero.
+         * However, the Linux ISAPNP code historically used six bits for the
+         * first character, and there seem to be IDs that depend on that,
+         * e.g., "nEC8241" in the Linux 8250_pnp serial driver and the
+         * FreeBSD sys/pc98/cbus/sio_cbus.c driver.
+         */
+        str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
+        str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
+        str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
+        str[3] = hex_asc((id >> 12) & 0xf);
+        str[4] = hex_asc((id >>  8) & 0xf);
+        str[5] = hex_asc((id >>  4) & 0xf);
+        str[6] = hex_asc((id >>  0) & 0xf);
+        str[7] = '\0';
+}
+
+void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
+{
+#ifdef DEBUG
+        struct resource *res;
+        int i;
+
+        dev_dbg(&dev->dev, "current resources: %s\n", desc);
+
+        for (i = 0; i < PNP_MAX_IRQ; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  irq %lld flags %#lx\n",
+                                (unsigned long long) res->start, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_DMA; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_DMA, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  dma %lld flags %#lx\n",
+                                (unsigned long long) res->start, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_PORT; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_IO, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
+                                (unsigned long long) res->start,
+                                (unsigned long long) res->end, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_MEM; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_MEM, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
+                                (unsigned long long) res->start,
+                                (unsigned long long) res->end, res->flags);
+        }
+#endif
+}
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 55c4563986b3..9c2496dbeee4 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -56,14 +56,15 @@ static void reserve_range(struct pnp_dev *dev, resource_size_t start,
 
 static void reserve_resources_of_dev(struct pnp_dev *dev)
 {
+        struct resource *res;
         int i;
 
-        for (i = 0; i < PNP_MAX_PORT; i++) {
-                if (!pnp_port_valid(dev, i))
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+                if (res->flags & IORESOURCE_UNSET)
                         continue;
-                if (pnp_port_start(dev, i) == 0)
+                if (res->start == 0)
                         continue;       /* disabled */
-                if (pnp_port_start(dev, i) < 0x100)
+                if (res->start < 0x100)
                         /*
                          * Below 0x100 is only standard PC hardware
                          * (pics, kbd, timer, dma, ...)
@@ -73,19 +74,17 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
                          * So, do nothing
                          */
                         continue;
-                if (pnp_port_end(dev, i) < pnp_port_start(dev, i))
+                if (res->end < res->start)
                         continue;       /* invalid */
 
-                reserve_range(dev, pnp_port_start(dev, i),
-                              pnp_port_end(dev, i), 1);
+                reserve_range(dev, res->start, res->end, 1);
         }
 
-        for (i = 0; i < PNP_MAX_MEM; i++) {
-                if (!pnp_mem_valid(dev, i))
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
+                if (res->flags & IORESOURCE_UNSET)
                         continue;
 
-                reserve_range(dev, pnp_mem_start(dev, i),
-                              pnp_mem_end(dev, i), 0);
+                reserve_range(dev, res->start, res->end, 0);
         }
 }
 
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index dcdc142a3441..d060a06ce05b 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -854,11 +854,12 @@ cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
                  * don't define the IRQ. It should always be safe to
                  * hardcode it in these cases
                  */
-                return cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8);
+                return cmos_do_probe(&pnp->dev,
+                                pnp_get_resource(pnp, IORESOURCE_IO, 0), 8);
         else
                 return cmos_do_probe(&pnp->dev,
-                                     &pnp->res.port_resource[0],
-                                     pnp->res.irq_resource[0].start);
+                                pnp_get_resource(pnp, IORESOURCE_IO, 0),
+                                pnp_irq(pnp, 0));
 }
 
 static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 17e71d56f31e..4b628526df09 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig THERMAL
-        bool "Generic Thermal sysfs driver"
+        tristate "Generic Thermal sysfs driver"
         help
           Generic Thermal Sysfs driver offers a generic mechanism for
           thermal management. Usually it's made up of one or more thermal
@@ -11,4 +11,4 @@ menuconfig THERMAL
           Each thermal zone contains its own temperature, trip points,
           cooling devices.
           All platforms with ACPI thermal support can use this driver.
-          If you want this support, you should say Y here.
+          If you want this support, you should say Y or M here.
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 8ef1232de376..31108a01c22e 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -2,4 +2,4 @@
 # Makefile for sensor chip drivers.
 #
 
-obj-$(CONFIG_THERMAL)           += thermal.o
+obj-$(CONFIG_THERMAL)           += thermal_sys.o
diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal_sys.c
index 7f79bbf652d7..6098787341f3 100644
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal_sys.c
@@ -31,7 +31,7 @@
 #include <linux/thermal.h>
 #include <linux/spinlock.h>
 
-MODULE_AUTHOR("Zhang Rui")
+MODULE_AUTHOR("Zhang Rui");
 MODULE_DESCRIPTION("Generic thermal management sysfs support");
 MODULE_LICENSE("GPL");
 
@@ -295,6 +295,164 @@ thermal_cooling_device_trip_point_show(struct device *dev,
 
 /* Device management */
 
+#if defined(CONFIG_HWMON) ||    \
+        (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE))
+/* hwmon sys I/F */
+#include <linux/hwmon.h>
+static LIST_HEAD(thermal_hwmon_list);
+
+static ssize_t
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct thermal_hwmon_device *hwmon = dev->driver_data;
+        return sprintf(buf, "%s\n", hwmon->type);
+}
+static DEVICE_ATTR(name, 0444, name_show, NULL);
+
+static ssize_t
+temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct thermal_hwmon_attr *hwmon_attr
+                        = container_of(attr, struct thermal_hwmon_attr, attr);
+        struct thermal_zone_device *tz
+                        = container_of(hwmon_attr, struct thermal_zone_device,
+                                       temp_input);
+
+        return tz->ops->get_temp(tz, buf);
+}
+
+static ssize_t
+temp_crit_show(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct thermal_hwmon_attr *hwmon_attr
+                        = container_of(attr, struct thermal_hwmon_attr, attr);
+        struct thermal_zone_device *tz
+                        = container_of(hwmon_attr, struct thermal_zone_device,
+                                       temp_crit);
+
+        return tz->ops->get_trip_temp(tz, 0, buf);
+}
+
+
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+        struct thermal_hwmon_device *hwmon;
+        int new_hwmon_device = 1;
+        int result;
+
+        mutex_lock(&thermal_list_lock);
+        list_for_each_entry(hwmon, &thermal_hwmon_list, node)
+                if (!strcmp(hwmon->type, tz->type)) {
+                        new_hwmon_device = 0;
+                        mutex_unlock(&thermal_list_lock);
+                        goto register_sys_interface;
+                }
+        mutex_unlock(&thermal_list_lock);
+
+        hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
+        if (!hwmon)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&hwmon->tz_list);
+        strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
+        hwmon->device = hwmon_device_register(NULL);
+        if (IS_ERR(hwmon->device)) {
+                result = PTR_ERR(hwmon->device);
+                goto free_mem;
+        }
+        hwmon->device->driver_data = hwmon;
+        result = device_create_file(hwmon->device, &dev_attr_name);
+        if (result)
+                goto unregister_hwmon_device;
+
+ register_sys_interface:
+        tz->hwmon = hwmon;
+        hwmon->count++;
+
+        snprintf(tz->temp_input.name, THERMAL_NAME_LENGTH,
+                 "temp%d_input", hwmon->count);
+        tz->temp_input.attr.attr.name = tz->temp_input.name;
+        tz->temp_input.attr.attr.mode = 0444;
+        tz->temp_input.attr.show = temp_input_show;
+        result = device_create_file(hwmon->device, &tz->temp_input.attr);
+        if (result)
+                goto unregister_hwmon_device;
+
+        if (tz->ops->get_crit_temp) {
+                unsigned long temperature;
+                if (!tz->ops->get_crit_temp(tz, &temperature)) {
+                        snprintf(tz->temp_crit.name, THERMAL_NAME_LENGTH,
+                                "temp%d_crit", hwmon->count);
+                        tz->temp_crit.attr.attr.name = tz->temp_crit.name;
+                        tz->temp_crit.attr.attr.mode = 0444;
+                        tz->temp_crit.attr.show = temp_crit_show;
+                        result = device_create_file(hwmon->device,
+                                                    &tz->temp_crit.attr);
+                        if (result)
+                                goto unregister_hwmon_device;
+                }
+        }
+
+        mutex_lock(&thermal_list_lock);
+        if (new_hwmon_device)
+                list_add_tail(&hwmon->node, &thermal_hwmon_list);
+        list_add_tail(&tz->hwmon_node, &hwmon->tz_list);
+        mutex_unlock(&thermal_list_lock);
+
+        return 0;
+
+ unregister_hwmon_device:
+        device_remove_file(hwmon->device, &tz->temp_crit.attr);
+        device_remove_file(hwmon->device, &tz->temp_input.attr);
+        if (new_hwmon_device) {
+                device_remove_file(hwmon->device, &dev_attr_name);
+                hwmon_device_unregister(hwmon->device);
+        }
+ free_mem:
+        if (new_hwmon_device)
+                kfree(hwmon);
+
+        return result;
+}
+
+static void
+thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+        struct thermal_hwmon_device *hwmon = tz->hwmon;
+
+        tz->hwmon = NULL;
+        device_remove_file(hwmon->device, &tz->temp_input.attr);
+        device_remove_file(hwmon->device, &tz->temp_crit.attr);
+
+        mutex_lock(&thermal_list_lock);
+        list_del(&tz->hwmon_node);
+        if (!list_empty(&hwmon->tz_list)) {
+                mutex_unlock(&thermal_list_lock);
+                return;
+        }
+        list_del(&hwmon->node);
+        mutex_unlock(&thermal_list_lock);
+
+        device_remove_file(hwmon->device, &dev_attr_name);
+        hwmon_device_unregister(hwmon->device);
+        kfree(hwmon);
+}
+#else
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+        return 0;
+}
+
+static void
+thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+}
+#endif
+
+
 /**
  * thermal_zone_bind_cooling_device - bind a cooling device to a thermal zone
  * @tz:         thermal zone device
@@ -642,6 +800,10 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
                         goto unregister;
         }
 
+        result = thermal_add_hwmon_sysfs(tz);
+        if (result)
+                goto unregister;
+
         mutex_lock(&thermal_list_lock);
         list_add_tail(&tz->node, &thermal_tz_list);
         if (ops->bind)
@@ -700,6 +862,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
         for (count = 0; count < tz->trips; count++)
                 TRIP_POINT_ATTR_REMOVE(&tz->device, count);
 
+        thermal_remove_hwmon_sysfs(tz);
         release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
         idr_destroy(&tz->idr);
         mutex_destroy(&tz->lock);