195 files changed, 10493 insertions, 2800 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 2f557f570ade..00cf9553f740 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -107,4 +107,6 @@ source "drivers/uio/Kconfig"
 source "drivers/xen/Kconfig"
 
 source "drivers/staging/Kconfig"
+
+source "drivers/platform/Kconfig"
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 6326f4dbbdab..c1bf41737936 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -105,3 +105,4 @@ obj-$(CONFIG_OF)		+= of/
 obj-$(CONFIG_SSB)               += ssb/
 obj-$(CONFIG_VIRTIO)            += virtio/
 obj-$(CONFIG_STAGING)           += staging/
+obj-y                           += platform/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b0243fd55ac0..d7f9839ba264 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -196,90 +196,6 @@ config ACPI_NUMA
         depends on (X86 || IA64)
         default y if IA64_GENERIC || IA64_SGI_SN2
 
-config ACPI_WMI
-        tristate "WMI (EXPERIMENTAL)"
-        depends on X86
-        depends on EXPERIMENTAL
-        help
-          This driver adds support for the ACPI-WMI (Windows Management
-          Instrumentation) mapper device (PNP0C14) found on some systems.
-
-          ACPI-WMI is a proprietary extension to ACPI to expose parts of the
-          ACPI firmware to userspace - this is done through various vendor
-          defined methods and data blocks in a PNP0C14 device, which are then
-          made available for userspace to call.
-
-          The implementation of this in Linux currently only exposes this to
-          other kernel space drivers.
-
-          This driver is a required dependency to build the firmware specific
-          drivers needed on many machines, including Acer and HP laptops.
-
-          It is safe to enable this driver even if your DSDT doesn't define
-          any ACPI-WMI devices.
-
-config ACPI_ASUS
-        tristate "ASUS/Medion Laptop Extras"
-        depends on X86
-        select BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This driver provides support for extra features of ACPI-compatible
-          ASUS laptops. As some of Medion laptops are made by ASUS, it may also
-          support some Medion laptops (such as 9675 for example).  It makes all
-          the extra buttons generate standard ACPI events that go through
-          /proc/acpi/events, and (on some models) adds support for changing the
-          display brightness and output, switching the LCD backlight on and off,
-          and most importantly, allows you to blink those fancy LEDs intended
-          for reporting mail and wireless status.
-
-          Note: display switching code is currently considered EXPERIMENTAL,
-          toying with these values may even lock your machine.
-
-          All settings are changed via /proc/acpi/asus directory entries. Owner
-          and group for these entries can be set with asus_uid and asus_gid
-          parameters.
-
-          More information and a userspace daemon for handling the extra buttons
-          at <http://sourceforge.net/projects/acpi4asus/>.
-
-          If you have an ACPI-compatible ASUS laptop, say Y or M here. This
-          driver is still under development, so if your laptop is unsupported or
-          something works not quite as expected, please use the mailing list
-          available on the above page (acpi4asus-user@lists.sourceforge.net).
-
-          NOTE: This driver is deprecated and will probably be removed soon,
-          use asus-laptop instead.
-
-config ACPI_TOSHIBA
-        tristate "Toshiba Laptop Extras"
-        depends on X86 && INPUT
-        select INPUT_POLLDEV
-        select NET
-        select RFKILL
-        select BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This driver adds support for access to certain system settings
-          on "legacy free" Toshiba laptops.  These laptops can be recognized by
-          their lack of a BIOS setup menu and APM support.
-
-          On these machines, all system configuration is handled through the
-          ACPI.  This driver is required for access to controls not covered
-          by the general ACPI drivers, such as LCD brightness, video output,
-          etc.
-
-          This driver differs from the non-ACPI Toshiba laptop driver (located
-          under "Processor type and features") in several aspects.
-          Configuration is accessed by reading and writing text files in the
-          /proc tree instead of by program interface to /dev.  Furthermore, no
-          power management functions are exposed, as those are handled by the
-          general ACPI drivers.
-
-          More information about this driver is available at
-          <http://memebeam.org/toys/ToshibaAcpiDriver>.
-
-          If you have a legacy free Toshiba laptop (such as the Libretto L1
-          series), say Y.
-
 config ACPI_CUSTOM_DSDT_FILE
         string "Custom DSDT Table file to include"
         default ""
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3c0c93300f12..d80f4cc2e0da 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -2,15 +2,8 @@
 # Makefile for the Linux ACPI interpreter
 #
 
-export ACPI_CFLAGS
-
-ACPI_CFLAGS     := -Os
-
-ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS   += -DACPI_DEBUG_OUTPUT
-endif
-
-EXTRA_CFLAGS    += $(ACPI_CFLAGS)
+ccflags-y                       := -Os
+ccflags-$(CONFIG_ACPI_DEBUG)    += -DACPI_DEBUG_OUTPUT
 
 #
 # ACPI Boot-Time Table Parsing
@@ -22,9 +15,13 @@ obj-$(CONFIG_X86)		+= blacklist.o
 # ACPI Core Subsystem (Interpreter)
 #
 obj-y                           += osl.o utils.o reboot.o\
-                                   dispatcher/ events/ executer/ hardware/ \
-                                   namespace/ parser/ resources/ tables/ \
-                                   utilities/
+                                        acpica/
+
+# sleep related files
+obj-y                           += wakeup.o
+obj-y                           += main.o
+obj-$(CONFIG_ACPI_SLEEP)        += proc.o
+
 
 #
 # ACPI Bus and Device Drivers
@@ -35,7 +32,6 @@ ifdef CONFIG_CPU_FREQ
 processor-objs  += processor_perflib.o
 endif
 
-obj-y                           += sleep/
 obj-y                           += bus.o glue.o
 obj-y                           += scan.o
 # Keep EC driver first. Initialization of others depend on it.
@@ -59,9 +55,6 @@ obj-y				+= power.o
 obj-$(CONFIG_ACPI_SYSTEM)       += system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)        += debug.o
 obj-$(CONFIG_ACPI_NUMA)         += numa.o
-obj-$(CONFIG_ACPI_WMI)          += wmi.o
-obj-$(CONFIG_ACPI_ASUS)         += asus_acpi.o
-obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)       += acpi_memhotplug.o
 obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 obj-$(CONFIG_ACPI_SBS)          += sbshc.o
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
new file mode 100644
index 000000000000..3f23298ee3fd
--- /dev/null
+++ b/drivers/acpi/acpica/Makefile
@@ -0,0 +1,44 @@
+#
+# Makefile for ACPICA Core interpreter
+#
+
+ccflags-y                       := -Os
+ccflags-$(CONFIG_ACPI_DEBUG)    += -DACPI_DEBUG_OUTPUT
+
+obj-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+         dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+         dsinit.o
+
+obj-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+         evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+         evgpe.o    evgpeblk.o
+
+obj-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+         exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+         excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o
+
+obj-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o
+
+obj-$(ACPI_FUTURE_USAGE) += hwtimer.o
+
+obj-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+         nsparse.o   nspredef.o
+
+obj-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
+
+obj-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+         psopcode.o  psscope.o  psutils.o  psxface.o
+
+obj-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+         rscalc.o  rsirq.o  rsmemory.o  rsutils.o
+
+obj-$(ACPI_FUTURE_USAGE) += rsdump.o
+
+obj-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
+
+obj-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+                utstate.o utmutex.o utobject.o utresrc.o
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
new file mode 100644
index 000000000000..3b20786cbb0d
--- /dev/null
+++ b/drivers/acpi/acpica/accommon.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ * Name: accommon.h - Common include files for generation of ACPICA source
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACCOMMON_H__
+#define __ACCOMMON_H__
+
+/*
+ * Common set of includes for all ACPICA source files.
+ * We put them here because we don't want to duplicate them
+ * in the the source code again and again.
+ *
+ * Note: The order of these include files is important.
+ */
+#include "acconfig.h"           /* Global configuration constants */
+#include "acmacros.h"           /* C macros */
+#include "aclocal.h"            /* Internal data types */
+#include "acobject.h"           /* ACPI internal object */
+#include "acstruct.h"           /* Common structures */
+#include "acglobal.h"           /* All global variables */
+#include "achware.h"            /* Hardware defines and interfaces */
+#include "acutils.h"            /* Utility interfaces */
+
+#endif                          /* __ACCOMMON_H__ */
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
new file mode 100644
index 000000000000..e6777fb883d2
--- /dev/null
+++ b/drivers/acpi/acpica/acconfig.h
@@ -0,0 +1,217 @@
+/******************************************************************************
+ *
+ * Name: acconfig.h - Global configuration constants
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACCONFIG_H
+#define _ACCONFIG_H
+
+/******************************************************************************
+ *
+ * Configuration options
+ *
+ *****************************************************************************/
+
+/*
+ * ACPI_DEBUG_OUTPUT    - This switch enables all the debug facilities of the
+ *                        ACPI subsystem.  This includes the DEBUG_PRINT output
+ *                        statements.  When disabled, all DEBUG_PRINT
+ *                        statements are compiled out.
+ *
+ * ACPI_APPLICATION     - Use this switch if the subsystem is going to be run
+ *                        at the application level.
+ *
+ */
+
+/*
+ * OS name, used for the _OS object.  The _OS object is essentially obsolete,
+ * but there is a large base of ASL/AML code in existing machines that check
+ * for the string below.  The use of this string usually guarantees that
+ * the ASL will execute down the most tested code path.  Also, there is some
+ * code that will not execute the _OSI method unless _OS matches the string
+ * below.  Therefore, change this string at your own risk.
+ */
+#define ACPI_OS_NAME                    "Microsoft Windows NT"
+
+/* Maximum objects in the various object caches */
+
+#define ACPI_MAX_STATE_CACHE_DEPTH      96      /* State objects */
+#define ACPI_MAX_PARSE_CACHE_DEPTH      96      /* Parse tree objects */
+#define ACPI_MAX_EXTPARSE_CACHE_DEPTH   96      /* Parse tree objects */
+#define ACPI_MAX_OBJECT_CACHE_DEPTH     96      /* Interpreter operand objects */
+#define ACPI_MAX_NAMESPACE_CACHE_DEPTH  96      /* Namespace objects */
+
+/*
+ * Should the subsystem abort the loading of an ACPI table if the
+ * table checksum is incorrect?
+ */
+#define ACPI_CHECKSUM_ABORT             FALSE
+
+/******************************************************************************
+ *
+ * Subsystem Constants
+ *
+ *****************************************************************************/
+
+/* Version of ACPI supported */
+
+#define ACPI_CA_SUPPORT_LEVEL           3
+
+/* Maximum count for a semaphore object */
+
+#define ACPI_MAX_SEMAPHORE_COUNT        256
+
+/* Maximum object reference count (detects object deletion issues) */
+
+#define ACPI_MAX_REFERENCE_COUNT        0x1000
+
+/* Size of cached memory mapping for system memory operation region */
+
+#define ACPI_SYSMEM_REGION_WINDOW_SIZE  4096
+
+/* owner_id tracking. 8 entries allows for 255 owner_ids */
+
+#define ACPI_NUM_OWNERID_MASKS          8
+
+/* Size of the root table array is increased by this increment */
+
+#define ACPI_ROOT_TABLE_SIZE_INCREMENT  4
+
+/* Maximum number of While() loop iterations before forced abort */
+
+#define ACPI_MAX_LOOP_ITERATIONS        0xFFFF
+
+/******************************************************************************
+ *
+ * ACPI Specification constants (Do not change unless the specification changes)
+ *
+ *****************************************************************************/
+
+/* Number of distinct GPE register blocks and register width */
+
+#define ACPI_MAX_GPE_BLOCKS             2
+#define ACPI_GPE_REGISTER_WIDTH         8
+
+/* Method info (in WALK_STATE), containing local variables and argumetns */
+
+#define ACPI_METHOD_NUM_LOCALS          8
+#define ACPI_METHOD_MAX_LOCAL           7
+
+#define ACPI_METHOD_NUM_ARGS            7
+#define ACPI_METHOD_MAX_ARG             6
+
+/* Length of _HID, _UID, _CID, and UUID values */
+
+#define ACPI_DEVICE_ID_LENGTH           0x09
+#define ACPI_MAX_CID_LENGTH             48
+#define ACPI_UUID_LENGTH                16
+
+/*
+ * Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG
+ */
+#define ACPI_OBJ_NUM_OPERANDS           8
+#define ACPI_OBJ_MAX_OPERAND            7
+
+/* Number of elements in the Result Stack frame, can be an arbitrary value */
+
+#define ACPI_RESULTS_FRAME_OBJ_NUM      8
+
+/*
+ * Maximal number of elements the Result Stack can contain,
+ * it may be an arbitray value not exceeding the types of
+ * result_size and result_count (now u8).
+ */
+#define ACPI_RESULTS_OBJ_NUM_MAX        255
+
+/* Names within the namespace are 4 bytes long */
+
+#define ACPI_NAME_SIZE                  4
+#define ACPI_PATH_SEGMENT_LENGTH        5       /* 4 chars for name + 1 char for separator */
+#define ACPI_PATH_SEPARATOR             '.'
+
+/* Sizes for ACPI table headers */
+
+#define ACPI_OEM_ID_SIZE                6
+#define ACPI_OEM_TABLE_ID_SIZE          8
+
+/* Constants used in searching for the RSDP in low memory */
+
+#define ACPI_EBDA_PTR_LOCATION          0x0000040E      /* Physical Address */
+#define ACPI_EBDA_PTR_LENGTH            2
+#define ACPI_EBDA_WINDOW_SIZE           1024
+#define ACPI_HI_RSDP_WINDOW_BASE        0x000E0000      /* Physical Address */
+#define ACPI_HI_RSDP_WINDOW_SIZE        0x00020000
+#define ACPI_RSDP_SCAN_STEP             16
+
+/* Operation regions */
+
+#define ACPI_NUM_PREDEFINED_REGIONS     8
+#define ACPI_USER_REGION_BEGIN          0x80
+
+/* Maximum space_ids for Operation Regions */
+
+#define ACPI_MAX_ADDRESS_SPACE          255
+
+/* Array sizes.  Used for range checking also */
+
+#define ACPI_MAX_MATCH_OPCODE           5
+
+/* RSDP checksums */
+
+#define ACPI_RSDP_CHECKSUM_LENGTH       20
+#define ACPI_RSDP_XCHECKSUM_LENGTH      36
+
+/* SMBus bidirectional buffer size */
+
+#define ACPI_SMBUS_BUFFER_SIZE          34
+
+/******************************************************************************
+ *
+ * ACPI AML Debugger
+ *
+ *****************************************************************************/
+
+#define ACPI_DEBUGGER_MAX_ARGS          8       /* Must be max method args + 1 */
+
+#define ACPI_DEBUGGER_COMMAND_PROMPT    '-'
+#define ACPI_DEBUGGER_EXECUTE_PROMPT    '%'
+
+#endif                          /* _ACCONFIG_H */
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
new file mode 100644
index 000000000000..62c59df3b86c
--- /dev/null
+++ b/drivers/acpi/acpica/acdebug.h
@@ -0,0 +1,231 @@
+/******************************************************************************
+ *
+ * Name: acdebug.h - ACPI/AML debugger
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACDEBUG_H__
+#define __ACDEBUG_H__
+
+#define ACPI_DEBUG_BUFFER_SIZE  4196
+
+struct command_info {
+        char *name;             /* Command Name */
+        u8 min_args;            /* Minimum arguments required */
+};
+
+struct argument_info {
+        char *name;             /* Argument Name */
+};
+
+#define PARAM_LIST(pl)                  pl
+#define DBTEST_OUTPUT_LEVEL(lvl)        if (acpi_gbl_db_opt_verbose)
+#define VERBOSE_PRINT(fp)               DBTEST_OUTPUT_LEVEL(lvl) {\
+                          acpi_os_printf PARAM_LIST(fp);}
+
+#define EX_NO_SINGLE_STEP               1
+#define EX_SINGLE_STEP                  2
+
+/*
+ * dbxface - external debugger interfaces
+ */
+acpi_status acpi_db_initialize(void);
+
+void acpi_db_terminate(void);
+
+acpi_status
+acpi_db_single_step(struct acpi_walk_state *walk_state,
+                    union acpi_parse_object *op, u32 op_type);
+
+/*
+ * dbcmds - debug commands and output routines
+ */
+acpi_status acpi_db_disassemble_method(char *name);
+
+void acpi_db_display_table_info(char *table_arg);
+
+void acpi_db_unload_acpi_table(char *table_arg, char *instance_arg);
+
+void
+acpi_db_set_method_breakpoint(char *location,
+                              struct acpi_walk_state *walk_state,
+                              union acpi_parse_object *op);
+
+void acpi_db_set_method_call_breakpoint(union acpi_parse_object *op);
+
+void acpi_db_get_bus_info(void);
+
+void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);
+
+void acpi_db_dump_namespace(char *start_arg, char *depth_arg);
+
+void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);
+
+void acpi_db_send_notify(char *name, u32 value);
+
+void acpi_db_set_method_data(char *type_arg, char *index_arg, char *value_arg);
+
+acpi_status
+acpi_db_display_objects(char *obj_type_arg, char *display_count_arg);
+
+acpi_status acpi_db_find_name_in_namespace(char *name_arg);
+
+void acpi_db_set_scope(char *name);
+
+acpi_status acpi_db_sleep(char *object_arg);
+
+void acpi_db_find_references(char *object_arg);
+
+void acpi_db_display_locks(void);
+
+void acpi_db_display_resources(char *object_arg);
+
+void acpi_db_display_gpes(void);
+
+void acpi_db_check_integrity(void);
+
+void acpi_db_generate_gpe(char *gpe_arg, char *block_arg);
+
+void acpi_db_check_predefined_names(void);
+
+void acpi_db_batch_execute(void);
+
+/*
+ * dbdisply - debug display commands
+ */
+void acpi_db_display_method_info(union acpi_parse_object *op);
+
+void acpi_db_decode_and_display_object(char *target, char *output_type);
+
+void
+acpi_db_display_result_object(union acpi_operand_object *obj_desc,
+                              struct acpi_walk_state *walk_state);
+
+acpi_status acpi_db_display_all_methods(char *display_count_arg);
+
+void acpi_db_display_arguments(void);
+
+void acpi_db_display_locals(void);
+
+void acpi_db_display_results(void);
+
+void acpi_db_display_calling_tree(void);
+
+void acpi_db_display_object_type(char *object_arg);
+
+void
+acpi_db_display_argument_object(union acpi_operand_object *obj_desc,
+                                struct acpi_walk_state *walk_state);
+
+void acpi_db_check_predefined_names(void);
+
+void acpi_db_batch_execute(void);
+
+/*
+ * dbexec - debugger control method execution
+ */
+void acpi_db_execute(char *name, char **args, u32 flags);
+
+void
+acpi_db_create_execution_threads(char *num_threads_arg,
+                                 char *num_loops_arg, char *method_name_arg);
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+u32 acpi_db_get_cache_info(struct acpi_memory_list *cache);
+#endif
+
+/*
+ * dbfileio - Debugger file I/O commands
+ */
+acpi_object_type
+acpi_db_match_argument(char *user_argument, struct argument_info *arguments);
+
+void acpi_db_close_debug_file(void);
+
+void acpi_db_open_debug_file(char *name);
+
+acpi_status acpi_db_load_acpi_table(char *filename);
+
+acpi_status
+acpi_db_get_table_from_file(char *filename, struct acpi_table_header **table);
+
+acpi_status
+acpi_db_read_table_from_file(char *filename, struct acpi_table_header **table);
+
+/*
+ * dbhistry - debugger HISTORY command
+ */
+void acpi_db_add_to_history(char *command_line);
+
+void acpi_db_display_history(void);
+
+char *acpi_db_get_from_history(char *command_num_arg);
+
+/*
+ * dbinput - user front-end to the AML debugger
+ */
+acpi_status
+acpi_db_command_dispatch(char *input_buffer,
+                         struct acpi_walk_state *walk_state,
+                         union acpi_parse_object *op);
+
+void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context);
+
+/*
+ * dbstats - Generation and display of ACPI table statistics
+ */
+void acpi_db_generate_statistics(union acpi_parse_object *root, u8 is_method);
+
+acpi_status acpi_db_display_statistics(char *type_arg);
+
+/*
+ * dbutils - AML debugger utilities
+ */
+void acpi_db_set_output_destination(u32 where);
+
+void acpi_db_dump_external_object(union acpi_object *obj_desc, u32 level);
+
+void acpi_db_prep_namestring(char *name);
+
+struct acpi_namespace_node *acpi_db_local_ns_lookup(char *name);
+
+void acpi_db_uint32_to_hex_string(u32 value, char *buffer);
+
+#endif                          /* __ACDEBUG_H__ */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
new file mode 100644
index 000000000000..6291904be01e
--- /dev/null
+++ b/drivers/acpi/acpica/acdispat.h
@@ -0,0 +1,345 @@
+/******************************************************************************
+ *
+ * Name: acdispat.h - dispatcher (parser to interpreter interface)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACDISPAT_H_
+#define _ACDISPAT_H_
+
+#define NAMEOF_LOCAL_NTE    "__L0"
+#define NAMEOF_ARG_NTE      "__A0"
+
+/*
+ * dsopcode - support for late evaluation
+ */
+acpi_status
+acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc);
+
+acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *rgn_desc);
+
+acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc);
+
+acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
+                                   union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
+                             union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
+                                   union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
+                                  union acpi_parse_object *op,
+                                  union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
+                                 union acpi_parse_object *op);
+
+acpi_status acpi_ds_initialize_region(acpi_handle obj_handle);
+
+/*
+ * dsctrl - Parser/Interpreter interface, control stack routines
+ */
+acpi_status
+acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
+                              union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state,
+                            union acpi_parse_object *op);
+
+/*
+ * dsexec - Parser/Interpreter interface, method execution callbacks
+ */
+acpi_status
+acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
+                            union acpi_operand_object *result_obj);
+
+acpi_status
+acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
+                      union acpi_parse_object **out_op);
+
+acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *state);
+
+/*
+ * dsfield - Parser/Interpreter interface for AML fields
+ */
+acpi_status
+acpi_ds_create_field(union acpi_parse_object *op,
+                     struct acpi_namespace_node *region_node,
+                     struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_create_bank_field(union acpi_parse_object *op,
+                          struct acpi_namespace_node *region_node,
+                          struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_create_index_field(union acpi_parse_object *op,
+                           struct acpi_namespace_node *region_node,
+                           struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_create_buffer_field(union acpi_parse_object *op,
+                            struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_init_field_objects(union acpi_parse_object *op,
+                           struct acpi_walk_state *walk_state);
+
+/*
+ * dsload - Parser/Interpreter interface, namespace load callbacks
+ */
+acpi_status
+acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
+                       union acpi_parse_object **out_op);
+
+acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
+                       union acpi_parse_object **out_op);
+
+acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number);
+
+/*
+ * dsmthdat - method data (locals/args)
+ */
+acpi_status
+acpi_ds_store_object_to_local(u8 type,
+                              u32 index,
+                              union acpi_operand_object *src_desc,
+                              struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_method_data_get_entry(u16 opcode,
+                              u32 index,
+                              struct acpi_walk_state *walk_state,
+                              union acpi_operand_object ***node);
+
+void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state);
+
+u8 acpi_ds_is_method_value(union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ds_method_data_get_value(u8 type,
+                              u32 index,
+                              struct acpi_walk_state *walk_state,
+                              union acpi_operand_object **dest_desc);
+
+acpi_status
+acpi_ds_method_data_init_args(union acpi_operand_object **params,
+                              u32 max_param_count,
+                              struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_method_data_get_node(u8 type,
+                             u32 index,
+                             struct acpi_walk_state *walk_state,
+                             struct acpi_namespace_node **node);
+
+void acpi_ds_method_data_init(struct acpi_walk_state *walk_state);
+
+/*
+ * dsmethod - Parser/Interpreter interface - control method parsing
+ */
+acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node);
+
+acpi_status
+acpi_ds_call_control_method(struct acpi_thread_state *thread,
+                            struct acpi_walk_state *walk_state,
+                            union acpi_parse_object *op);
+
+acpi_status
+acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
+                               union acpi_operand_object *return_desc);
+
+void
+acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
+                                 struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
+                               union acpi_operand_object *obj_desc,
+                               struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state);
+
+/*
+ * dsinit
+ */
+acpi_status
+acpi_ds_initialize_objects(u32 table_index,
+                           struct acpi_namespace_node *start_node);
+
+/*
+ * dsobject - Parser/Interpreter interface - object initialization and conversion
+ */
+acpi_status
+acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
+                                  union acpi_parse_object *op,
+                                  u32 buffer_length,
+                                  union acpi_operand_object **obj_desc_ptr);
+
+acpi_status
+acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
+                                   union acpi_parse_object *op,
+                                   u32 package_length,
+                                   union acpi_operand_object **obj_desc);
+
+acpi_status
+acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
+                            union acpi_parse_object *op,
+                            u16 opcode, union acpi_operand_object **obj_desc);
+
+acpi_status
+acpi_ds_create_node(struct acpi_walk_state *walk_state,
+                    struct acpi_namespace_node *node,
+                    union acpi_parse_object *op);
+
+/*
+ * dsutils - Parser/Interpreter interface utility routines
+ */
+void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state);
+
+u8
+acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,
+                           struct acpi_walk_state *walk_state,
+                           u8 add_reference);
+
+u8
+acpi_ds_is_result_used(union acpi_parse_object *op,
+                       struct acpi_walk_state *walk_state);
+
+void
+acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
+                                  union acpi_operand_object *result_obj,
+                                  struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_create_operand(struct acpi_walk_state *walk_state,
+                       union acpi_parse_object *arg, u32 args_remaining);
+
+acpi_status
+acpi_ds_create_operands(struct acpi_walk_state *walk_state,
+                        union acpi_parse_object *first_arg);
+
+acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state);
+
+void acpi_ds_clear_operands(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ds_evaluate_name_path(struct acpi_walk_state *walk_state);
+
+/*
+ * dswscope - Scope Stack manipulation
+ */
+acpi_status
+acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
+                         acpi_object_type type,
+                         struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state);
+
+void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state);
+
+/*
+ * dswstate - parser WALK_STATE management routines
+ */
+acpi_status
+acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state);
+
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                  *origin, union acpi_operand_object
+                                                  *mth_desc, struct acpi_thread_state
+                                                  *thread);
+
+acpi_status
+acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
+                      union acpi_parse_object *op,
+                      struct acpi_namespace_node *method_node,
+                      u8 * aml_start,
+                      u32 aml_length,
+                      struct acpi_evaluate_info *info, u8 pass_number);
+
+void
+acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
+                                 struct acpi_walk_state *walk_state);
+
+void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state);
+
+struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state
+                                               *thread);
+
+void
+acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
+                        struct acpi_thread_state *thread);
+
+acpi_status acpi_ds_result_stack_clear(struct acpi_walk_state *walk_state);
+
+struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
+                                                       *thread);
+
+acpi_status
+acpi_ds_result_pop(union acpi_operand_object **object,
+                   struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ds_result_push(union acpi_operand_object *object,
+                    struct acpi_walk_state *walk_state);
+
+#endif                          /* _ACDISPAT_H_ */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
new file mode 100644
index 000000000000..07e20135f01b
--- /dev/null
+++ b/drivers/acpi/acpica/acevents.h
@@ -0,0 +1,218 @@
+/******************************************************************************
+ *
+ * Name: acevents.h - Event subcomponent prototypes and defines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACEVENTS_H__
+#define __ACEVENTS_H__
+
+/*
+ * evevent
+ */
+acpi_status acpi_ev_initialize_events(void);
+
+acpi_status acpi_ev_install_xrupt_handlers(void);
+
+acpi_status acpi_ev_install_fadt_gpes(void);
+
+u32 acpi_ev_fixed_event_detect(void);
+
+/*
+ * evmisc
+ */
+u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node);
+
+acpi_status acpi_ev_acquire_global_lock(u16 timeout);
+
+acpi_status acpi_ev_release_global_lock(void);
+
+acpi_status acpi_ev_init_global_lock_handler(void);
+
+u32 acpi_ev_get_gpe_number_index(u32 gpe_number);
+
+acpi_status
+acpi_ev_queue_notify_request(struct acpi_namespace_node *node,
+                             u32 notify_value);
+
+/*
+ * evgpe - GPE handling and dispatch
+ */
+acpi_status
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
+                                u8 type);
+
+acpi_status
+acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
+                   u8 write_to_hardware);
+
+acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
+struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
+                                                       u32 gpe_number);
+
+/*
+ * evgpeblk
+ */
+u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
+
+acpi_status
+acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
+
+acpi_status
+acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                            struct acpi_gpe_block_info *gpe_block,
+                            void *context);
+
+acpi_status
+acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
+                         struct acpi_generic_address *gpe_block_address,
+                         u32 register_count,
+                         u8 gpe_block_base_number,
+                         u32 interrupt_number,
+                         struct acpi_gpe_block_info **return_gpe_block);
+
+acpi_status
+acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
+                             struct acpi_gpe_block_info *gpe_block);
+
+acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);
+
+u32
+acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,
+                     u32 gpe_number);
+
+u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
+
+acpi_status
+acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
+
+acpi_status
+acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
+acpi_status acpi_ev_gpe_initialize(void);
+
+/*
+ * evregion - Address Space handling
+ */
+acpi_status acpi_ev_install_region_handlers(void);
+
+acpi_status acpi_ev_initialize_op_regions(void);
+
+acpi_status
+acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
+                               u32 function,
+                               acpi_physical_address address,
+                               u32 bit_width, acpi_integer * value);
+
+acpi_status
+acpi_ev_attach_region(union acpi_operand_object *handler_obj,
+                      union acpi_operand_object *region_obj,
+                      u8 acpi_ns_is_locked);
+
+void
+acpi_ev_detach_region(union acpi_operand_object *region_obj,
+                      u8 acpi_ns_is_locked);
+
+acpi_status
+acpi_ev_install_space_handler(struct acpi_namespace_node *node,
+                              acpi_adr_space_type space_id,
+                              acpi_adr_space_handler handler,
+                              acpi_adr_space_setup setup, void *context);
+
+acpi_status
+acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
+                            acpi_adr_space_type space_id);
+
+acpi_status
+acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function);
+
+/*
+ * evregini - Region initialization and setup
+ */
+acpi_status
+acpi_ev_system_memory_region_setup(acpi_handle handle,
+                                   u32 function,
+                                   void *handler_context,
+                                   void **region_context);
+
+acpi_status
+acpi_ev_io_space_region_setup(acpi_handle handle,
+                              u32 function,
+                              void *handler_context, void **region_context);
+
+acpi_status
+acpi_ev_pci_config_region_setup(acpi_handle handle,
+                                u32 function,
+                                void *handler_context, void **region_context);
+
+acpi_status
+acpi_ev_cmos_region_setup(acpi_handle handle,
+                          u32 function,
+                          void *handler_context, void **region_context);
+
+acpi_status
+acpi_ev_pci_bar_region_setup(acpi_handle handle,
+                             u32 function,
+                             void *handler_context, void **region_context);
+
+acpi_status
+acpi_ev_default_region_setup(acpi_handle handle,
+                             u32 function,
+                             void *handler_context, void **region_context);
+
+acpi_status
+acpi_ev_initialize_region(union acpi_operand_object *region_obj,
+                          u8 acpi_ns_locked);
+
+/*
+ * evsci - SCI (System Control Interrupt) handling/dispatch
+ */
+u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context);
+
+u32 acpi_ev_install_sci_handler(void);
+
+acpi_status acpi_ev_remove_sci_handler(void);
+
+u32 acpi_ev_initialize_sCI(u32 program_sCI);
+
+void acpi_ev_terminate(void);
+
+#endif                          /* __ACEVENTS_H__  */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
new file mode 100644
index 000000000000..ddb40f5c68fc
--- /dev/null
+++ b/drivers/acpi/acpica/acglobal.h
@@ -0,0 +1,394 @@
+/******************************************************************************
+ *
+ * Name: acglobal.h - Declarations for global variables
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACGLOBAL_H__
+#define __ACGLOBAL_H__
+
+/*
+ * Ensure that the globals are actually defined and initialized only once.
+ *
+ * The use of these macros allows a single list of globals (here) in order
+ * to simplify maintenance of the code.
+ */
+#ifdef DEFINE_ACPI_GLOBALS
+#define ACPI_EXTERN
+#define ACPI_INIT_GLOBAL(a,b) a=b
+#else
+#define ACPI_EXTERN extern
+#define ACPI_INIT_GLOBAL(a,b) a
+#endif
+
+/*****************************************************************************
+ *
+ * Runtime configuration (static defaults that can be overriden at runtime)
+ *
+ ****************************************************************************/
+
+/*
+ * Enable "slack" in the AML interpreter?  Default is FALSE, and the
+ * interpreter strictly follows the ACPI specification.  Setting to TRUE
+ * allows the interpreter to ignore certain errors and/or bad AML constructs.
+ *
+ * Currently, these features are enabled by this flag:
+ *
+ * 1) Allow "implicit return" of last value in a control method
+ * 2) Allow access beyond the end of an operation region
+ * 3) Allow access to uninitialized locals/args (auto-init to integer 0)
+ * 4) Allow ANY object type to be a source operand for the Store() operator
+ * 5) Allow unresolved references (invalid target name) in package objects
+ * 6) Enable warning messages for behavior that is not ACPI spec compliant
+ */
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);
+
+/*
+ * Automatically serialize ALL control methods? Default is FALSE, meaning
+ * to use the Serialized/not_serialized method flags on a per method basis.
+ * Only change this if the ASL code is poorly written and cannot handle
+ * reentrancy even though methods are marked "NotSerialized".
+ */
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);
+
+/*
+ * Create the predefined _OSI method in the namespace? Default is TRUE
+ * because ACPI CA is fully compatible with other ACPI implementations.
+ * Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.
+ */
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);
+
+/*
+ * Disable wakeup GPEs during runtime? Default is TRUE because WAKE and
+ * RUNTIME GPEs should never be shared, and WAKE GPEs should typically only
+ * be enabled just before going to sleep.
+ */
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
+
+/*
+ * Optionally use default values for the ACPI register widths. Set this to
+ * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
+ */
+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
+
+/*****************************************************************************
+ *
+ * Debug support
+ *
+ ****************************************************************************/
+
+/* Runtime configuration of debug print levels */
+
+extern u32 acpi_dbg_level;
+extern u32 acpi_dbg_layer;
+
+/* Procedure nesting level for debug output */
+
+extern u32 acpi_gbl_nesting_level;
+
+/* Support for dynamic control method tracing mechanism */
+
+ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
+ACPI_EXTERN acpi_name acpi_gbl_trace_method_name;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
+ACPI_EXTERN u32 acpi_gbl_trace_flags;
+
+/*****************************************************************************
+ *
+ * ACPI Table globals
+ *
+ ****************************************************************************/
+
+/*
+ * acpi_gbl_root_table_list is the master list of ACPI tables found in the
+ * RSDT/XSDT.
+ *
+ * acpi_gbl_FADT is a local copy of the FADT, converted to a common format.
+ */
+ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
+ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
+ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
+
+/* These addresses are calculated from FADT address values */
+
+ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable;
+ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;
+
+/*
+ * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is
+ * determined by the revision of the DSDT: If the DSDT revision is less than
+ * 2, use only the lower 32 bits of the internal 64-bit Integer.
+ */
+ACPI_EXTERN u8 acpi_gbl_integer_bit_width;
+ACPI_EXTERN u8 acpi_gbl_integer_byte_width;
+ACPI_EXTERN u8 acpi_gbl_integer_nybble_width;
+
+/*****************************************************************************
+ *
+ * Mutual exlusion within ACPICA subsystem
+ *
+ ****************************************************************************/
+
+/*
+ * Predefined mutex objects. This array contains the
+ * actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.
+ * (The table maps local handles to the real OS handles)
+ */
+ACPI_EXTERN struct acpi_mutex_info acpi_gbl_mutex_info[ACPI_NUM_MUTEX];
+
+/*
+ * Global lock mutex is an actual AML mutex object
+ * Global lock semaphore works in conjunction with the HW global lock
+ */
+ACPI_EXTERN union acpi_operand_object *acpi_gbl_global_lock_mutex;
+ACPI_EXTERN acpi_semaphore acpi_gbl_global_lock_semaphore;
+ACPI_EXTERN u16 acpi_gbl_global_lock_handle;
+ACPI_EXTERN u8 acpi_gbl_global_lock_acquired;
+ACPI_EXTERN u8 acpi_gbl_global_lock_present;
+
+/*
+ * Spinlocks are used for interfaces that can be possibly called at
+ * interrupt level
+ */
+ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock;      /* For GPE data structs and registers */
+ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
+#define acpi_gbl_gpe_lock       &_acpi_gbl_gpe_lock
+#define acpi_gbl_hardware_lock  &_acpi_gbl_hardware_lock
+
+/*****************************************************************************
+ *
+ * Miscellaneous globals
+ *
+ ****************************************************************************/
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+
+/* Lists for tracking memory allocations */
+
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;
+ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;
+#endif
+
+/* Object caches */
+
+ACPI_EXTERN acpi_cache_t *acpi_gbl_namespace_cache;
+ACPI_EXTERN acpi_cache_t *acpi_gbl_state_cache;
+ACPI_EXTERN acpi_cache_t *acpi_gbl_ps_node_cache;
+ACPI_EXTERN acpi_cache_t *acpi_gbl_ps_node_ext_cache;
+ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache;
+
+/* Global handlers */
+
+ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_device_notify;
+ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify;
+ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;
+ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
+ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;
+ACPI_EXTERN void *acpi_gbl_table_handler_context;
+ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;
+
+/* Owner ID support */
+
+ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS];
+ACPI_EXTERN u8 acpi_gbl_last_owner_id_index;
+ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset;
+
+/* Misc */
+
+ACPI_EXTERN u32 acpi_gbl_original_mode;
+ACPI_EXTERN u32 acpi_gbl_rsdp_original_location;
+ACPI_EXTERN u32 acpi_gbl_ns_lookup_count;
+ACPI_EXTERN u32 acpi_gbl_ps_find_count;
+ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save;
+ACPI_EXTERN u8 acpi_gbl_debugger_configuration;
+ACPI_EXTERN u8 acpi_gbl_step_to_next_call;
+ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
+ACPI_EXTERN u8 acpi_gbl_events_initialized;
+ACPI_EXTERN u8 acpi_gbl_system_awake_and_running;
+
+#ifndef DEFINE_ACPI_GLOBALS
+
+/* Other miscellaneous */
+
+extern u8 acpi_gbl_shutdown;
+extern u32 acpi_gbl_startup_flags;
+extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];
+extern const char *acpi_gbl_highest_dstate_names[4];
+extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
+extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
+
+#endif
+
+/* Exception codes */
+
+extern char const *acpi_gbl_exception_names_env[];
+extern char const *acpi_gbl_exception_names_pgm[];
+extern char const *acpi_gbl_exception_names_tbl[];
+extern char const *acpi_gbl_exception_names_aml[];
+extern char const *acpi_gbl_exception_names_ctrl[];
+
+/*****************************************************************************
+ *
+ * Namespace globals
+ *
+ ****************************************************************************/
+
+#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
+#define NUM_PREDEFINED_NAMES            10
+#else
+#define NUM_PREDEFINED_NAMES            9
+#endif
+
+ACPI_EXTERN struct acpi_namespace_node acpi_gbl_root_node_struct;
+ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node;
+ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_fadt_gpe_device;
+
+extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];
+extern const struct acpi_predefined_names
+    acpi_gbl_pre_defined_names[NUM_PREDEFINED_NAMES];
+
+#ifdef ACPI_DEBUG_OUTPUT
+ACPI_EXTERN u32 acpi_gbl_current_node_count;
+ACPI_EXTERN u32 acpi_gbl_current_node_size;
+ACPI_EXTERN u32 acpi_gbl_max_concurrent_node_count;
+ACPI_EXTERN acpi_size *acpi_gbl_entry_stack_pointer;
+ACPI_EXTERN acpi_size *acpi_gbl_lowest_stack_pointer;
+ACPI_EXTERN u32 acpi_gbl_deepest_nesting;
+#endif
+
+/*****************************************************************************
+ *
+ * Interpreter globals
+ *
+ ****************************************************************************/
+
+ACPI_EXTERN struct acpi_thread_state *acpi_gbl_current_walk_list;
+
+/* Control method single step flag */
+
+ACPI_EXTERN u8 acpi_gbl_cm_single_step;
+
+/*****************************************************************************
+ *
+ * Hardware globals
+ *
+ ****************************************************************************/
+
+extern struct acpi_bit_register_info
+    acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
+ACPI_EXTERN u8 acpi_gbl_sleep_type_a;
+ACPI_EXTERN u8 acpi_gbl_sleep_type_b;
+
+/*****************************************************************************
+ *
+ * Event and GPE globals
+ *
+ ****************************************************************************/
+
+extern struct acpi_fixed_event_info
+    acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
+ACPI_EXTERN struct acpi_fixed_event_handler
+    acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
+ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
+ACPI_EXTERN struct acpi_gpe_block_info
+*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
+ACPI_EXTERN u32 acpi_current_gpe_count;
+
+/*****************************************************************************
+ *
+ * Debugger globals
+ *
+ ****************************************************************************/
+
+ACPI_EXTERN u8 acpi_gbl_db_output_flags;
+
+#ifdef ACPI_DISASSEMBLER
+
+ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;
+ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;
+#endif
+
+#ifdef ACPI_DEBUGGER
+
+extern u8 acpi_gbl_method_executing;
+extern u8 acpi_gbl_abort_method;
+extern u8 acpi_gbl_db_terminate_threads;
+
+ACPI_EXTERN int optind;
+ACPI_EXTERN char *optarg;
+
+ACPI_EXTERN u8 acpi_gbl_db_opt_tables;
+ACPI_EXTERN u8 acpi_gbl_db_opt_stats;
+ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;
+
+ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_EXTERN char acpi_gbl_db_line_buf[80];
+ACPI_EXTERN char acpi_gbl_db_parsed_buf[80];
+ACPI_EXTERN char acpi_gbl_db_scope_buf[40];
+ACPI_EXTERN char acpi_gbl_db_debug_filename[40];
+ACPI_EXTERN u8 acpi_gbl_db_output_to_file;
+ACPI_EXTERN char *acpi_gbl_db_buffer;
+ACPI_EXTERN char *acpi_gbl_db_filename;
+ACPI_EXTERN u32 acpi_gbl_db_debug_level;
+ACPI_EXTERN u32 acpi_gbl_db_console_debug_level;
+ACPI_EXTERN struct acpi_table_header *acpi_gbl_db_table_ptr;
+ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node;
+
+/*
+ * Statistic globals
+ */
+ACPI_EXTERN u16 acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX + 1];
+ACPI_EXTERN u16 acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX + 1];
+ACPI_EXTERN u16 acpi_gbl_obj_type_count_misc;
+ACPI_EXTERN u16 acpi_gbl_node_type_count_misc;
+ACPI_EXTERN u32 acpi_gbl_num_nodes;
+ACPI_EXTERN u32 acpi_gbl_num_objects;
+
+ACPI_EXTERN u32 acpi_gbl_size_of_parse_tree;
+ACPI_EXTERN u32 acpi_gbl_size_of_method_trees;
+ACPI_EXTERN u32 acpi_gbl_size_of_node_entries;
+ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;
+
+#endif                          /* ACPI_DEBUGGER */
+
+#endif                          /* __ACGLOBAL_H__ */
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
new file mode 100644
index 000000000000..58c69dc49ab4
--- /dev/null
+++ b/drivers/acpi/acpica/achware.h
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ * Name: achware.h -- hardware specific interfaces
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACHWARE_H__
+#define __ACHWARE_H__
+
+/* Values for the _SST predefined method */
+
+#define ACPI_SST_INDICATOR_OFF  0
+#define ACPI_SST_WORKING        1
+#define ACPI_SST_WAKING         2
+#define ACPI_SST_SLEEPING       3
+#define ACPI_SST_SLEEP_CONTEXT  4
+
+/*
+ * hwacpi - high level functions
+ */
+acpi_status acpi_hw_set_mode(u32 mode);
+
+u32 acpi_hw_get_mode(void);
+
+/*
+ * hwregs - ACPI Register I/O
+ */
+struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id);
+
+acpi_status
+acpi_hw_register_read(u32 register_id, u32 * return_value);
+
+acpi_status acpi_hw_register_write(u32 register_id, u32 value);
+
+acpi_status acpi_hw_clear_acpi_status(void);
+
+/*
+ * hwgpe - GPE support
+ */
+acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
+acpi_status
+acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info *gpe_event_info);
+
+acpi_status
+acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                          struct acpi_gpe_block_info *gpe_block, void *context);
+
+acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
+acpi_status
+acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                        struct acpi_gpe_block_info *gpe_block, void *context);
+
+acpi_status
+acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,
+                       acpi_event_status * event_status);
+
+acpi_status acpi_hw_disable_all_gpes(void);
+
+acpi_status acpi_hw_enable_all_runtime_gpes(void);
+
+acpi_status acpi_hw_enable_all_wakeup_gpes(void);
+
+acpi_status
+acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                                 struct acpi_gpe_block_info *gpe_block,
+                                 void *context);
+
+#ifdef  ACPI_FUTURE_USAGE
+/*
+ * hwtimer - ACPI Timer prototypes
+ */
+acpi_status acpi_get_timer_resolution(u32 * resolution);
+
+acpi_status acpi_get_timer(u32 * ticks);
+
+acpi_status
+acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+#endif                          /* __ACHWARE_H__ */
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
new file mode 100644
index 000000000000..e8db7a3143a5
--- /dev/null
+++ b/drivers/acpi/acpica/acinterp.h
@@ -0,0 +1,529 @@
+/******************************************************************************
+ *
+ * Name: acinterp.h - Interpreter subcomponent prototypes and defines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACINTERP_H__
+#define __ACINTERP_H__
+
+#define ACPI_WALK_OPERANDS          (&(walk_state->operands [walk_state->num_operands -1]))
+
+/* Macros for tables used for debug output */
+
+#define ACPI_EXD_OFFSET(f)          (u8) ACPI_OFFSET (union acpi_operand_object,f)
+#define ACPI_EXD_NSOFFSET(f)        (u8) ACPI_OFFSET (struct acpi_namespace_node,f)
+#define ACPI_EXD_TABLE_SIZE(name)   (sizeof(name) / sizeof (struct acpi_exdump_info))
+
+/*
+ * If possible, pack the following structures to byte alignment, since we
+ * don't care about performance for debug output. Two cases where we cannot
+ * pack the structures:
+ *
+ * 1) Hardware does not support misaligned memory transfers
+ * 2) Compiler does not support pointers within packed structures
+ */
+#if (!defined(ACPI_MISALIGNMENT_NOT_SUPPORTED) && !defined(ACPI_PACKED_POINTERS_NOT_SUPPORTED))
+#pragma pack(1)
+#endif
+
+typedef const struct acpi_exdump_info {
+        u8 opcode;
+        u8 offset;
+        char *name;
+
+} acpi_exdump_info;
+
+/* Values for the Opcode field above */
+
+#define ACPI_EXD_INIT                   0
+#define ACPI_EXD_TYPE                   1
+#define ACPI_EXD_UINT8                  2
+#define ACPI_EXD_UINT16                 3
+#define ACPI_EXD_UINT32                 4
+#define ACPI_EXD_UINT64                 5
+#define ACPI_EXD_LITERAL                6
+#define ACPI_EXD_POINTER                7
+#define ACPI_EXD_ADDRESS                8
+#define ACPI_EXD_STRING                 9
+#define ACPI_EXD_BUFFER                 10
+#define ACPI_EXD_PACKAGE                11
+#define ACPI_EXD_FIELD                  12
+#define ACPI_EXD_REFERENCE              13
+
+/* restore default alignment */
+
+#pragma pack()
+
+/*
+ * exconvrt - object conversion
+ */
+acpi_status
+acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
+                           union acpi_operand_object **result_desc, u32 flags);
+
+acpi_status
+acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
+                          union acpi_operand_object **result_desc);
+
+acpi_status
+acpi_ex_convert_to_string(union acpi_operand_object *obj_desc,
+                          union acpi_operand_object **result_desc, u32 type);
+
+/* Types for ->String conversion */
+
+#define ACPI_EXPLICIT_BYTE_COPY         0x00000000
+#define ACPI_EXPLICIT_CONVERT_HEX       0x00000001
+#define ACPI_IMPLICIT_CONVERT_HEX       0x00000002
+#define ACPI_EXPLICIT_CONVERT_DECIMAL   0x00000003
+
+acpi_status
+acpi_ex_convert_to_target_type(acpi_object_type destination_type,
+                               union acpi_operand_object *source_desc,
+                               union acpi_operand_object **result_desc,
+                               struct acpi_walk_state *walk_state);
+
+/*
+ * exfield - ACPI AML (p-code) execution - field manipulation
+ */
+acpi_status
+acpi_ex_common_buffer_setup(union acpi_operand_object *obj_desc,
+                            u32 buffer_length, u32 * datum_count);
+
+acpi_status
+acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
+                               acpi_integer mask,
+                               acpi_integer field_value,
+                               u32 field_datum_byte_offset);
+
+void
+acpi_ex_get_buffer_datum(acpi_integer * datum,
+                         void *buffer,
+                         u32 buffer_length,
+                         u32 byte_granularity, u32 buffer_offset);
+
+void
+acpi_ex_set_buffer_datum(acpi_integer merged_datum,
+                         void *buffer,
+                         u32 buffer_length,
+                         u32 byte_granularity, u32 buffer_offset);
+
+acpi_status
+acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
+                             union acpi_operand_object *obj_desc,
+                             union acpi_operand_object **ret_buffer_desc);
+
+acpi_status
+acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
+                            union acpi_operand_object *obj_desc,
+                            union acpi_operand_object **result_desc);
+
+/*
+ * exfldio - low level field I/O
+ */
+acpi_status
+acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
+                           void *buffer, u32 buffer_length);
+
+acpi_status
+acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
+                          void *buffer, u32 buffer_length);
+
+acpi_status
+acpi_ex_access_region(union acpi_operand_object *obj_desc,
+                      u32 field_datum_byte_offset,
+                      acpi_integer * value, u32 read_write);
+
+/*
+ * exmisc - misc support routines
+ */
+acpi_status
+acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
+                             union acpi_operand_object **return_desc,
+                             struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_concat_template(union acpi_operand_object *obj_desc,
+                        union acpi_operand_object *obj_desc2,
+                        union acpi_operand_object **actual_return_desc,
+                        struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_do_concatenate(union acpi_operand_object *obj_desc,
+                       union acpi_operand_object *obj_desc2,
+                       union acpi_operand_object **actual_return_desc,
+                       struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_do_logical_numeric_op(u16 opcode,
+                              acpi_integer integer0,
+                              acpi_integer integer1, u8 * logical_result);
+
+acpi_status
+acpi_ex_do_logical_op(u16 opcode,
+                      union acpi_operand_object *operand0,
+                      union acpi_operand_object *operand1, u8 * logical_result);
+
+acpi_integer
+acpi_ex_do_math_op(u16 opcode, acpi_integer operand0, acpi_integer operand1);
+
+acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_create_processor(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_create_power_resource(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_create_region(u8 * aml_start,
+                      u32 aml_length,
+                      u8 region_space, struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_create_method(u8 * aml_start,
+                      u32 aml_length, struct acpi_walk_state *walk_state);
+
+/*
+ * exconfig - dynamic table load/unload
+ */
+acpi_status
+acpi_ex_load_op(union acpi_operand_object *obj_desc,
+                union acpi_operand_object *target,
+                struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
+                      union acpi_operand_object **return_desc);
+
+acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle);
+
+/*
+ * exmutex - mutex support
+ */
+acpi_status
+acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
+                      union acpi_operand_object *obj_desc,
+                      struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_acquire_mutex_object(u16 timeout,
+                             union acpi_operand_object *obj_desc,
+                             acpi_thread_id thread_id);
+
+acpi_status
+acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
+                      struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc);
+
+void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread);
+
+void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc);
+
+/*
+ * exprep - ACPI AML execution - prep utilities
+ */
+acpi_status
+acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
+                                 u8 field_flags,
+                                 u8 field_attribute,
+                                 u32 field_bit_position, u32 field_bit_length);
+
+acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info);
+
+/*
+ * exsystem - Interface to OS services
+ */
+acpi_status
+acpi_ex_system_do_notify_op(union acpi_operand_object *value,
+                            union acpi_operand_object *obj_desc);
+
+acpi_status acpi_ex_system_do_suspend(acpi_integer time);
+
+acpi_status acpi_ex_system_do_stall(u32 time);
+
+acpi_status acpi_ex_system_signal_event(union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ex_system_wait_event(union acpi_operand_object *time,
+                          union acpi_operand_object *obj_desc);
+
+acpi_status acpi_ex_system_reset_event(union acpi_operand_object *obj_desc);
+
+acpi_status
+acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout);
+
+acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout);
+
+/*
+ * exoparg1 - ACPI AML execution, 1 operand
+ */
+acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state);
+
+/*
+ * exoparg2 - ACPI AML execution, 2 operands
+ */
+acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state);
+
+/*
+ * exoparg3 - ACPI AML execution, 3 operands
+ */
+acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state);
+
+acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state);
+
+/*
+ * exoparg6 - ACPI AML execution, 6 operands
+ */
+acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state *walk_state);
+
+/*
+ * exresolv - Object resolution and get value functions
+ */
+acpi_status
+acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
+                         struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
+                         union acpi_operand_object *operand,
+                         acpi_object_type * return_type,
+                         union acpi_operand_object **return_desc);
+
+/*
+ * exresnte - resolve namespace node
+ */
+acpi_status
+acpi_ex_resolve_node_to_value(struct acpi_namespace_node **stack_ptr,
+                              struct acpi_walk_state *walk_state);
+
+/*
+ * exresop - resolve operand to value
+ */
+acpi_status
+acpi_ex_resolve_operands(u16 opcode,
+                         union acpi_operand_object **stack_ptr,
+                         struct acpi_walk_state *walk_state);
+
+/*
+ * exdump - Interpreter debug output routines
+ */
+void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth);
+
+void
+acpi_ex_dump_operands(union acpi_operand_object **operands,
+                      const char *opcode_name, u32 num_opcodes);
+
+#ifdef  ACPI_FUTURE_USAGE
+void
+acpi_ex_dump_object_descriptor(union acpi_operand_object *object, u32 flags);
+
+void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+/*
+ * exnames - AML namestring support
+ */
+acpi_status
+acpi_ex_get_name_string(acpi_object_type data_type,
+                        u8 * in_aml_address,
+                        char **out_name_string, u32 * out_name_length);
+
+/*
+ * exstore - Object store support
+ */
+acpi_status
+acpi_ex_store(union acpi_operand_object *val_desc,
+              union acpi_operand_object *dest_desc,
+              struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
+                             struct acpi_namespace_node *node,
+                             struct acpi_walk_state *walk_state,
+                             u8 implicit_conversion);
+
+#define ACPI_IMPLICIT_CONVERSION        TRUE
+#define ACPI_NO_IMPLICIT_CONVERSION     FALSE
+
+/*
+ * exstoren - resolve/store object
+ */
+acpi_status
+acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
+                       acpi_object_type target_type,
+                       struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
+                               union acpi_operand_object *dest_desc,
+                               union acpi_operand_object **new_desc,
+                               struct acpi_walk_state *walk_state);
+
+/*
+ * exstorob - store object - buffer/string
+ */
+acpi_status
+acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
+                               union acpi_operand_object *target_desc);
+
+acpi_status
+acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
+                               union acpi_operand_object *target_desc);
+
+/*
+ * excopy - object copy
+ */
+acpi_status
+acpi_ex_copy_integer_to_index_field(union acpi_operand_object *source_desc,
+                                    union acpi_operand_object *target_desc);
+
+acpi_status
+acpi_ex_copy_integer_to_bank_field(union acpi_operand_object *source_desc,
+                                   union acpi_operand_object *target_desc);
+
+acpi_status
+acpi_ex_copy_data_to_named_field(union acpi_operand_object *source_desc,
+                                 struct acpi_namespace_node *node);
+
+acpi_status
+acpi_ex_copy_integer_to_buffer_field(union acpi_operand_object *source_desc,
+                                     union acpi_operand_object *target_desc);
+
+/*
+ * exutils - interpreter/scanner utilities
+ */
+void acpi_ex_enter_interpreter(void);
+
+void acpi_ex_exit_interpreter(void);
+
+void acpi_ex_reacquire_interpreter(void);
+
+void acpi_ex_relinquish_interpreter(void);
+
+void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc);
+
+void acpi_ex_acquire_global_lock(u32 rule);
+
+void acpi_ex_release_global_lock(u32 rule);
+
+void acpi_ex_eisa_id_to_string(u32 numeric_id, char *out_string);
+
+void acpi_ex_unsigned_integer_to_string(acpi_integer value, char *out_string);
+
+/*
+ * exregion - default op_region handlers
+ */
+acpi_status
+acpi_ex_system_memory_space_handler(u32 function,
+                                    acpi_physical_address address,
+                                    u32 bit_width,
+                                    acpi_integer * value,
+                                    void *handler_context,
+                                    void *region_context);
+
+acpi_status
+acpi_ex_system_io_space_handler(u32 function,
+                                acpi_physical_address address,
+                                u32 bit_width,
+                                acpi_integer * value,
+                                void *handler_context, void *region_context);
+
+acpi_status
+acpi_ex_pci_config_space_handler(u32 function,
+                                 acpi_physical_address address,
+                                 u32 bit_width,
+                                 acpi_integer * value,
+                                 void *handler_context, void *region_context);
+
+acpi_status
+acpi_ex_cmos_space_handler(u32 function,
+                           acpi_physical_address address,
+                           u32 bit_width,
+                           acpi_integer * value,
+                           void *handler_context, void *region_context);
+
+acpi_status
+acpi_ex_pci_bar_space_handler(u32 function,
+                              acpi_physical_address address,
+                              u32 bit_width,
+                              acpi_integer * value,
+                              void *handler_context, void *region_context);
+
+acpi_status
+acpi_ex_embedded_controller_space_handler(u32 function,
+                                          acpi_physical_address address,
+                                          u32 bit_width,
+                                          acpi_integer * value,
+                                          void *handler_context,
+                                          void *region_context);
+
+acpi_status
+acpi_ex_sm_bus_space_handler(u32 function,
+                             acpi_physical_address address,
+                             u32 bit_width,
+                             acpi_integer * value,
+                             void *handler_context, void *region_context);
+
+acpi_status
+acpi_ex_data_table_space_handler(u32 function,
+                                 acpi_physical_address address,
+                                 u32 bit_width,
+                                 acpi_integer * value,
+                                 void *handler_context, void *region_context);
+
+#endif                          /* __INTERP_H__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
new file mode 100644
index 000000000000..492d02761bb7
--- /dev/null
+++ b/drivers/acpi/acpica/aclocal.h
@@ -0,0 +1,990 @@
+/******************************************************************************
+ *
+ * Name: aclocal.h - Internal data types used across the ACPI subsystem
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACLOCAL_H__
+#define __ACLOCAL_H__
+
+/* acpisrc:struct_defs -- for acpisrc conversion */
+
+#define ACPI_SERIALIZED                 0xFF
+
+typedef u32 acpi_mutex_handle;
+#define ACPI_GLOBAL_LOCK                (acpi_semaphore) (-1)
+
+/* Total number of aml opcodes defined */
+
+#define AML_NUM_OPCODES                 0x7F
+
+/* Forward declarations */
+
+struct acpi_walk_state;
+struct acpi_obj_mutex;
+union acpi_parse_object;
+
+/*****************************************************************************
+ *
+ * Mutex typedefs and structs
+ *
+ ****************************************************************************/
+
+/*
+ * Predefined handles for the mutex objects used within the subsystem
+ * All mutex objects are automatically created by acpi_ut_mutex_initialize.
+ *
+ * The acquire/release ordering protocol is implied via this list. Mutexes
+ * with a lower value must be acquired before mutexes with a higher value.
+ *
+ * NOTE: any changes here must be reflected in the acpi_gbl_mutex_names
+ * table below also!
+ */
+#define ACPI_MTX_INTERPRETER            0       /* AML Interpreter, main lock */
+#define ACPI_MTX_NAMESPACE              1       /* ACPI Namespace */
+#define ACPI_MTX_TABLES                 2       /* Data for ACPI tables */
+#define ACPI_MTX_EVENTS                 3       /* Data for ACPI events */
+#define ACPI_MTX_CACHES                 4       /* Internal caches, general purposes */
+#define ACPI_MTX_MEMORY                 5       /* Debug memory tracking lists */
+#define ACPI_MTX_DEBUG_CMD_COMPLETE     6       /* AML debugger */
+#define ACPI_MTX_DEBUG_CMD_READY        7       /* AML debugger */
+
+#define ACPI_MAX_MUTEX                  7
+#define ACPI_NUM_MUTEX                  ACPI_MAX_MUTEX+1
+
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+#ifdef DEFINE_ACPI_GLOBALS
+
+/* Debug names for the mutexes above */
+
+static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = {
+        "ACPI_MTX_Interpreter",
+        "ACPI_MTX_Namespace",
+        "ACPI_MTX_Tables",
+        "ACPI_MTX_Events",
+        "ACPI_MTX_Caches",
+        "ACPI_MTX_Memory",
+        "ACPI_MTX_CommandComplete",
+        "ACPI_MTX_CommandReady"
+};
+
+#endif
+#endif
+
+/*
+ * Predefined handles for spinlocks used within the subsystem.
+ * These spinlocks are created by acpi_ut_mutex_initialize
+ */
+#define ACPI_LOCK_GPES                  0
+#define ACPI_LOCK_HARDWARE              1
+
+#define ACPI_MAX_LOCK                   1
+#define ACPI_NUM_LOCK                   ACPI_MAX_LOCK+1
+
+/* This Thread ID means that the mutex is not in use (unlocked) */
+
+#define ACPI_MUTEX_NOT_ACQUIRED         (acpi_thread_id) 0
+
+/* Table for the global mutexes */
+
+struct acpi_mutex_info {
+        acpi_mutex mutex;
+        u32 use_count;
+        acpi_thread_id thread_id;
+};
+
+/* Lock flag parameter for various interfaces */
+
+#define ACPI_MTX_DO_NOT_LOCK            0
+#define ACPI_MTX_LOCK                   1
+
+/* Field access granularities */
+
+#define ACPI_FIELD_BYTE_GRANULARITY     1
+#define ACPI_FIELD_WORD_GRANULARITY     2
+#define ACPI_FIELD_DWORD_GRANULARITY    4
+#define ACPI_FIELD_QWORD_GRANULARITY    8
+
+#define ACPI_ENTRY_NOT_FOUND            NULL
+
+/*****************************************************************************
+ *
+ * Namespace typedefs and structs
+ *
+ ****************************************************************************/
+
+/* Operational modes of the AML interpreter/scanner */
+
+typedef enum {
+        ACPI_IMODE_LOAD_PASS1 = 0x01,
+        ACPI_IMODE_LOAD_PASS2 = 0x02,
+        ACPI_IMODE_EXECUTE = 0x03
+} acpi_interpreter_mode;
+
+/*
+ * The Namespace Node describes a named object that appears in the AML.
+ * descriptor_type is used to differentiate between internal descriptors.
+ *
+ * The node is optimized for both 32-bit and 64-bit platforms:
+ * 20 bytes for the 32-bit case, 32 bytes for the 64-bit case.
+ *
+ * Note: The descriptor_type and Type fields must appear in the identical
+ * position in both the struct acpi_namespace_node and union acpi_operand_object
+ * structures.
+ */
+struct acpi_namespace_node {
+        union acpi_operand_object *object;      /* Interpreter object */
+        u8 descriptor_type;     /* Differentiate object descriptor types */
+        u8 type;                /* ACPI Type associated with this name */
+        u8 flags;               /* Miscellaneous flags */
+        acpi_owner_id owner_id; /* Node creator */
+        union acpi_name_union name;     /* ACPI Name, always 4 chars per ACPI spec */
+        struct acpi_namespace_node *child;      /* First child */
+        struct acpi_namespace_node *peer;       /* Peer. Parent if ANOBJ_END_OF_PEER_LIST set */
+
+        /*
+         * The following fields are used by the ASL compiler and disassembler only
+         */
+#ifdef ACPI_LARGE_NAMESPACE_NODE
+        union acpi_parse_object *op;
+        u32 value;
+        u32 length;
+#endif
+};
+
+/* Namespace Node flags */
+
+#define ANOBJ_END_OF_PEER_LIST          0x01    /* End-of-list, Peer field points to parent */
+#define ANOBJ_TEMPORARY                 0x02    /* Node is create by a method and is temporary */
+#define ANOBJ_METHOD_ARG                0x04    /* Node is a method argument */
+#define ANOBJ_METHOD_LOCAL              0x08    /* Node is a method local */
+#define ANOBJ_SUBTREE_HAS_INI           0x10    /* Used to optimize device initialization */
+#define ANOBJ_EVALUATED                 0x20    /* Set on first evaluation of node */
+
+#define ANOBJ_IS_EXTERNAL               0x08    /* i_aSL only: This object created via External() */
+#define ANOBJ_METHOD_NO_RETVAL          0x10    /* i_aSL only: Method has no return value */
+#define ANOBJ_METHOD_SOME_NO_RETVAL     0x20    /* i_aSL only: Method has at least one return value */
+#define ANOBJ_IS_BIT_OFFSET             0x40    /* i_aSL only: Reference is a bit offset */
+#define ANOBJ_IS_REFERENCED             0x80    /* i_aSL only: Object was referenced */
+
+/* One internal RSDT for table management */
+
+struct acpi_internal_rsdt {
+        struct acpi_table_desc *tables;
+        u32 count;
+        u32 size;
+        u8 flags;
+};
+
+/* Flags for above */
+
+#define ACPI_ROOT_ORIGIN_UNKNOWN        (0)     /* ~ORIGIN_ALLOCATED */
+#define ACPI_ROOT_ORIGIN_ALLOCATED      (1)
+#define ACPI_ROOT_ALLOW_RESIZE          (2)
+
+/* Predefined (fixed) table indexes */
+
+#define ACPI_TABLE_INDEX_DSDT           (0)
+#define ACPI_TABLE_INDEX_FACS           (1)
+
+struct acpi_find_context {
+        char *search_for;
+        acpi_handle *list;
+        u32 *count;
+};
+
+struct acpi_ns_search_data {
+        struct acpi_namespace_node *node;
+};
+
+/* Object types used during package copies */
+
+#define ACPI_COPY_TYPE_SIMPLE           0
+#define ACPI_COPY_TYPE_PACKAGE          1
+
+/* Info structure used to convert external<->internal namestrings */
+
+struct acpi_namestring_info {
+        const char *external_name;
+        const char *next_external_char;
+        char *internal_name;
+        u32 length;
+        u32 num_segments;
+        u32 num_carats;
+        u8 fully_qualified;
+};
+
+/* Field creation info */
+
+struct acpi_create_field_info {
+        struct acpi_namespace_node *region_node;
+        struct acpi_namespace_node *field_node;
+        struct acpi_namespace_node *register_node;
+        struct acpi_namespace_node *data_register_node;
+        u32 bank_value;
+        u32 field_bit_position;
+        u32 field_bit_length;
+        u8 field_flags;
+        u8 attribute;
+        u8 field_type;
+};
+
+typedef
+acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state);
+
+/*
+ * Bitmapped ACPI types.  Used internally only
+ */
+#define ACPI_BTYPE_ANY                  0x00000000
+#define ACPI_BTYPE_INTEGER              0x00000001
+#define ACPI_BTYPE_STRING               0x00000002
+#define ACPI_BTYPE_BUFFER               0x00000004
+#define ACPI_BTYPE_PACKAGE              0x00000008
+#define ACPI_BTYPE_FIELD_UNIT           0x00000010
+#define ACPI_BTYPE_DEVICE               0x00000020
+#define ACPI_BTYPE_EVENT                0x00000040
+#define ACPI_BTYPE_METHOD               0x00000080
+#define ACPI_BTYPE_MUTEX                0x00000100
+#define ACPI_BTYPE_REGION               0x00000200
+#define ACPI_BTYPE_POWER                0x00000400
+#define ACPI_BTYPE_PROCESSOR            0x00000800
+#define ACPI_BTYPE_THERMAL              0x00001000
+#define ACPI_BTYPE_BUFFER_FIELD         0x00002000
+#define ACPI_BTYPE_DDB_HANDLE           0x00004000
+#define ACPI_BTYPE_DEBUG_OBJECT         0x00008000
+#define ACPI_BTYPE_REFERENCE            0x00010000
+#define ACPI_BTYPE_RESOURCE             0x00020000
+
+#define ACPI_BTYPE_COMPUTE_DATA         (ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING | ACPI_BTYPE_BUFFER)
+
+#define ACPI_BTYPE_DATA                 (ACPI_BTYPE_COMPUTE_DATA  | ACPI_BTYPE_PACKAGE)
+#define ACPI_BTYPE_DATA_REFERENCE       (ACPI_BTYPE_DATA | ACPI_BTYPE_REFERENCE | ACPI_BTYPE_DDB_HANDLE)
+#define ACPI_BTYPE_DEVICE_OBJECTS       (ACPI_BTYPE_DEVICE | ACPI_BTYPE_THERMAL | ACPI_BTYPE_PROCESSOR)
+#define ACPI_BTYPE_OBJECTS_AND_REFS     0x0001FFFF      /* ARG or LOCAL */
+#define ACPI_BTYPE_ALL_OBJECTS          0x0000FFFF
+
+/*
+ * Information structure for ACPI predefined names.
+ * Each entry in the table contains the following items:
+ *
+ * Name                 - The ACPI reserved name
+ * param_count          - Number of arguments to the method
+ * expected_return_btypes - Allowed type(s) for the return value
+ */
+struct acpi_name_info {
+        char name[ACPI_NAME_SIZE];
+        u8 param_count;
+        u8 expected_btypes;
+};
+
+/*
+ * Secondary information structures for ACPI predefined objects that return
+ * package objects. This structure appears as the next entry in the table
+ * after the NAME_INFO structure above.
+ *
+ * The reason for this is to minimize the size of the predefined name table.
+ */
+
+/*
+ * Used for ACPI_PTYPE1_FIXED, ACPI_PTYPE1_VAR, ACPI_PTYPE2,
+ * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT
+ */
+struct acpi_package_info {
+        u8 type;
+        u8 object_type1;
+        u8 count1;
+        u8 object_type2;
+        u8 count2;
+        u8 reserved;
+};
+
+/* Used for ACPI_PTYPE2_FIXED */
+
+struct acpi_package_info2 {
+        u8 type;
+        u8 count;
+        u8 object_type[4];
+};
+
+/* Used for ACPI_PTYPE1_OPTION */
+
+struct acpi_package_info3 {
+        u8 type;
+        u8 count;
+        u8 object_type[2];
+        u8 tail_object_type;
+        u8 reserved;
+};
+
+union acpi_predefined_info {
+        struct acpi_name_info info;
+        struct acpi_package_info ret_info;
+        struct acpi_package_info2 ret_info2;
+        struct acpi_package_info3 ret_info3;
+};
+
+/*
+ * Bitmapped return value types
+ * Note: the actual data types must be contiguous, a loop in nspredef.c
+ * depends on this.
+ */
+#define ACPI_RTYPE_ANY                  0x00
+#define ACPI_RTYPE_NONE                 0x01
+#define ACPI_RTYPE_INTEGER              0x02
+#define ACPI_RTYPE_STRING               0x04
+#define ACPI_RTYPE_BUFFER               0x08
+#define ACPI_RTYPE_PACKAGE              0x10
+#define ACPI_RTYPE_REFERENCE            0x20
+#define ACPI_RTYPE_ALL                  0x3F
+
+#define ACPI_NUM_RTYPES                 5       /* Number of actual object types */
+
+/*****************************************************************************
+ *
+ * Event typedefs and structs
+ *
+ ****************************************************************************/
+
+/* Dispatch info for each GPE -- either a method or handler, cannot be both */
+
+struct acpi_handler_info {
+        acpi_event_handler address;     /* Address of handler, if any */
+        void *context;          /* Context to be passed to handler */
+        struct acpi_namespace_node *method_node;        /* Method node for this GPE level (saved) */
+};
+
+union acpi_gpe_dispatch_info {
+        struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
+        struct acpi_handler_info *handler;
+};
+
+/*
+ * Information about a GPE, one per each GPE in an array.
+ * NOTE: Important to keep this struct as small as possible.
+ */
+struct acpi_gpe_event_info {
+        union acpi_gpe_dispatch_info dispatch;  /* Either Method or Handler */
+        struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
+        u8 flags;               /* Misc info about this GPE */
+        u8 gpe_number;          /* This GPE */
+};
+
+/* Information about a GPE register pair, one per each status/enable pair in an array */
+
+struct acpi_gpe_register_info {
+        struct acpi_generic_address status_address;     /* Address of status reg */
+        struct acpi_generic_address enable_address;     /* Address of enable reg */
+        u8 enable_for_wake;     /* GPEs to keep enabled when sleeping */
+        u8 enable_for_run;      /* GPEs to keep enabled when running */
+        u8 base_gpe_number;     /* Base GPE number for this register */
+};
+
+/*
+ * Information about a GPE register block, one per each installed block --
+ * GPE0, GPE1, and one per each installed GPE Block Device.
+ */
+struct acpi_gpe_block_info {
+        struct acpi_namespace_node *node;
+        struct acpi_gpe_block_info *previous;
+        struct acpi_gpe_block_info *next;
+        struct acpi_gpe_xrupt_info *xrupt_block;        /* Backpointer to interrupt block */
+        struct acpi_gpe_register_info *register_info;   /* One per GPE register pair */
+        struct acpi_gpe_event_info *event_info; /* One for each GPE */
+        struct acpi_generic_address block_address;      /* Base address of the block */
+        u32 register_count;     /* Number of register pairs in block */
+        u8 block_base_number;   /* Base GPE number for this block */
+};
+
+/* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
+
+struct acpi_gpe_xrupt_info {
+        struct acpi_gpe_xrupt_info *previous;
+        struct acpi_gpe_xrupt_info *next;
+        struct acpi_gpe_block_info *gpe_block_list_head;        /* List of GPE blocks for this xrupt */
+        u32 interrupt_number;   /* System interrupt number */
+};
+
+struct acpi_gpe_walk_info {
+        struct acpi_namespace_node *gpe_device;
+        struct acpi_gpe_block_info *gpe_block;
+};
+
+struct acpi_gpe_device_info {
+        u32 index;
+        u32 next_block_base_index;
+        acpi_status status;
+        struct acpi_namespace_node *gpe_device;
+};
+
+typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                struct acpi_gpe_block_info *gpe_block, void *context);
+
+/* Information about each particular fixed event */
+
+struct acpi_fixed_event_handler {
+        acpi_event_handler handler;     /* Address of handler. */
+        void *context;          /* Context to be passed to handler */
+};
+
+struct acpi_fixed_event_info {
+        u8 status_register_id;
+        u8 enable_register_id;
+        u16 status_bit_mask;
+        u16 enable_bit_mask;
+};
+
+/* Information used during field processing */
+
+struct acpi_field_info {
+        u8 skip_field;
+        u8 field_flag;
+        u32 pkg_length;
+};
+
+/*****************************************************************************
+ *
+ * Generic "state" object for stacks
+ *
+ ****************************************************************************/
+
+#define ACPI_CONTROL_NORMAL                  0xC0
+#define ACPI_CONTROL_CONDITIONAL_EXECUTING   0xC1
+#define ACPI_CONTROL_PREDICATE_EXECUTING     0xC2
+#define ACPI_CONTROL_PREDICATE_FALSE         0xC3
+#define ACPI_CONTROL_PREDICATE_TRUE          0xC4
+
+#define ACPI_STATE_COMMON \
+        void                            *next; \
+        u8                              descriptor_type; /* To differentiate various internal objs */\
+        u8                              flags; \
+        u16                             value; \
+        u16                             state;
+
+        /* There are 2 bytes available here until the next natural alignment boundary */
+
+struct acpi_common_state {
+ACPI_STATE_COMMON};
+
+/*
+ * Update state - used to traverse complex objects such as packages
+ */
+struct acpi_update_state {
+        ACPI_STATE_COMMON union acpi_operand_object *object;
+};
+
+/*
+ * Pkg state - used to traverse nested package structures
+ */
+struct acpi_pkg_state {
+        ACPI_STATE_COMMON u16 index;
+        union acpi_operand_object *source_object;
+        union acpi_operand_object *dest_object;
+        struct acpi_walk_state *walk_state;
+        void *this_target_obj;
+        u32 num_packages;
+};
+
+/*
+ * Control state - one per if/else and while constructs.
+ * Allows nesting of these constructs
+ */
+struct acpi_control_state {
+        ACPI_STATE_COMMON u16 opcode;
+        union acpi_parse_object *predicate_op;
+        u8 *aml_predicate_start;        /* Start of if/while predicate */
+        u8 *package_end;        /* End of if/while block */
+        u32 loop_count;         /* While() loop counter */
+};
+
+/*
+ * Scope state - current scope during namespace lookups
+ */
+struct acpi_scope_state {
+        ACPI_STATE_COMMON struct acpi_namespace_node *node;
+};
+
+struct acpi_pscope_state {
+        ACPI_STATE_COMMON u32 arg_count;        /* Number of fixed arguments */
+        union acpi_parse_object *op;    /* Current op being parsed */
+        u8 *arg_end;            /* Current argument end */
+        u8 *pkg_end;            /* Current package end */
+        u32 arg_list;           /* Next argument to parse */
+};
+
+/*
+ * Thread state - one per thread across multiple walk states.  Multiple walk
+ * states are created when there are nested control methods executing.
+ */
+struct acpi_thread_state {
+        ACPI_STATE_COMMON u8 current_sync_level;        /* Mutex Sync (nested acquire) level */
+        struct acpi_walk_state *walk_state_list;        /* Head of list of walk_states for this thread */
+        union acpi_operand_object *acquired_mutex_list; /* List of all currently acquired mutexes */
+        acpi_thread_id thread_id;       /* Running thread ID */
+};
+
+/*
+ * Result values - used to accumulate the results of nested
+ * AML arguments
+ */
+struct acpi_result_values {
+        ACPI_STATE_COMMON
+            union acpi_operand_object *obj_desc[ACPI_RESULTS_FRAME_OBJ_NUM];
+};
+
+typedef
+acpi_status(*acpi_parse_downwards) (struct acpi_walk_state * walk_state,
+                                    union acpi_parse_object ** out_op);
+
+typedef acpi_status(*acpi_parse_upwards) (struct acpi_walk_state * walk_state);
+
+/*
+ * Notify info - used to pass info to the deferred notify
+ * handler/dispatcher.
+ */
+struct acpi_notify_info {
+        ACPI_STATE_COMMON struct acpi_namespace_node *node;
+        union acpi_operand_object *handler_obj;
+};
+
+/* Generic state is union of structs above */
+
+union acpi_generic_state {
+        struct acpi_common_state common;
+        struct acpi_control_state control;
+        struct acpi_update_state update;
+        struct acpi_scope_state scope;
+        struct acpi_pscope_state parse_scope;
+        struct acpi_pkg_state pkg;
+        struct acpi_thread_state thread;
+        struct acpi_result_values results;
+        struct acpi_notify_info notify;
+};
+
+/*****************************************************************************
+ *
+ * Interpreter typedefs and structs
+ *
+ ****************************************************************************/
+
+typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);
+
+/*****************************************************************************
+ *
+ * Parser typedefs and structs
+ *
+ ****************************************************************************/
+
+/*
+ * AML opcode, name, and argument layout
+ */
+struct acpi_opcode_info {
+#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
+        char *name;             /* Opcode name (disassembler/debug only) */
+#endif
+        u32 parse_args;         /* Grammar/Parse time arguments */
+        u32 runtime_args;       /* Interpret time arguments */
+        u16 flags;              /* Misc flags */
+        u8 object_type;         /* Corresponding internal object type */
+        u8 class;               /* Opcode class */
+        u8 type;                /* Opcode type */
+};
+
+union acpi_parse_value {
+        acpi_integer integer;   /* Integer constant (Up to 64 bits) */
+        struct uint64_struct integer64; /* Structure overlay for 2 32-bit Dwords */
+        u32 size;               /* bytelist or field size */
+        char *string;           /* NULL terminated string */
+        u8 *buffer;             /* buffer or string */
+        char *name;             /* NULL terminated string */
+        union acpi_parse_object *arg;   /* arguments and contained ops */
+};
+
+#ifdef ACPI_DISASSEMBLER
+#define ACPI_DISASM_ONLY_MEMBERS(a)     a;
+#else
+#define ACPI_DISASM_ONLY_MEMBERS(a)
+#endif
+
+#define ACPI_PARSE_COMMON \
+        union acpi_parse_object         *parent;        /* Parent op */\
+        u8                              descriptor_type; /* To differentiate various internal objs */\
+        u8                              flags;          /* Type of Op */\
+        u16                             aml_opcode;     /* AML opcode */\
+        u32                             aml_offset;     /* Offset of declaration in AML */\
+        union acpi_parse_object         *next;          /* Next op */\
+        struct acpi_namespace_node      *node;          /* For use by interpreter */\
+        union acpi_parse_value          value;          /* Value or args associated with the opcode */\
+        u8                              arg_list_length; /* Number of elements in the arg list */\
+        ACPI_DISASM_ONLY_MEMBERS (\
+        u8                              disasm_flags;   /* Used during AML disassembly */\
+        u8                              disasm_opcode;  /* Subtype used for disassembly */\
+        char                            aml_op_name[16])        /* Op name (debug only) */
+
+#define ACPI_DASM_BUFFER                0x00
+#define ACPI_DASM_RESOURCE              0x01
+#define ACPI_DASM_STRING                0x02
+#define ACPI_DASM_UNICODE               0x03
+#define ACPI_DASM_EISAID                0x04
+#define ACPI_DASM_MATCHOP               0x05
+#define ACPI_DASM_LNOT_PREFIX           0x06
+#define ACPI_DASM_LNOT_SUFFIX           0x07
+#define ACPI_DASM_IGNORE                0x08
+
+/*
+ * Generic operation (for example:  If, While, Store)
+ */
+struct acpi_parse_obj_common {
+ACPI_PARSE_COMMON};
+
+/*
+ * Extended Op for named ops (Scope, Method, etc.), deferred ops (Methods and op_regions),
+ * and bytelists.
+ */
+struct acpi_parse_obj_named {
+        ACPI_PARSE_COMMON u8 *path;
+        u8 *data;               /* AML body or bytelist data */
+        u32 length;             /* AML length */
+        u32 name;               /* 4-byte name or zero if no name */
+};
+
+/* This version is used by the i_aSL compiler only */
+
+#define ACPI_MAX_PARSEOP_NAME   20
+
+struct acpi_parse_obj_asl {
+        ACPI_PARSE_COMMON union acpi_parse_object *child;
+        union acpi_parse_object *parent_method;
+        char *filename;
+        char *external_name;
+        char *namepath;
+        char name_seg[4];
+        u32 extra_value;
+        u32 column;
+        u32 line_number;
+        u32 logical_line_number;
+        u32 logical_byte_offset;
+        u32 end_line;
+        u32 end_logical_line;
+        u32 acpi_btype;
+        u32 aml_length;
+        u32 aml_subtree_length;
+        u32 final_aml_length;
+        u32 final_aml_offset;
+        u32 compile_flags;
+        u16 parse_opcode;
+        u8 aml_opcode_length;
+        u8 aml_pkg_len_bytes;
+        u8 extra;
+        char parse_op_name[ACPI_MAX_PARSEOP_NAME];
+};
+
+union acpi_parse_object {
+        struct acpi_parse_obj_common common;
+        struct acpi_parse_obj_named named;
+        struct acpi_parse_obj_asl asl;
+};
+
+/*
+ * Parse state - one state per parser invocation and each control
+ * method.
+ */
+struct acpi_parse_state {
+        u8 *aml_start;          /* First AML byte */
+        u8 *aml;                /* Next AML byte */
+        u8 *aml_end;            /* (last + 1) AML byte */
+        u8 *pkg_start;          /* Current package begin */
+        u8 *pkg_end;            /* Current package end */
+        union acpi_parse_object *start_op;      /* Root of parse tree */
+        struct acpi_namespace_node *start_node;
+        union acpi_generic_state *scope;        /* Current scope */
+        union acpi_parse_object *start_scope;
+        u32 aml_size;
+};
+
+/* Parse object flags */
+
+#define ACPI_PARSEOP_GENERIC            0x01
+#define ACPI_PARSEOP_NAMED              0x02
+#define ACPI_PARSEOP_DEFERRED           0x04
+#define ACPI_PARSEOP_BYTELIST           0x08
+#define ACPI_PARSEOP_IN_STACK           0x10
+#define ACPI_PARSEOP_TARGET             0x20
+#define ACPI_PARSEOP_IN_CACHE           0x80
+
+/* Parse object disasm_flags */
+
+#define ACPI_PARSEOP_IGNORE             0x01
+#define ACPI_PARSEOP_PARAMLIST          0x02
+#define ACPI_PARSEOP_EMPTY_TERMLIST     0x04
+#define ACPI_PARSEOP_SPECIAL            0x10
+
+/*****************************************************************************
+ *
+ * Hardware (ACPI registers) and PNP
+ *
+ ****************************************************************************/
+
+struct acpi_bit_register_info {
+        u8 parent_register;
+        u8 bit_position;
+        u16 access_bit_mask;
+};
+
+/*
+ * Some ACPI registers have bits that must be ignored -- meaning that they
+ * must be preserved.
+ */
+#define ACPI_PM1_STATUS_PRESERVED_BITS          0x0800  /* Bit 11 */
+#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0200  /* Bit 9 (whatever) */
+
+/*
+ * Register IDs
+ * These are the full ACPI registers
+ */
+#define ACPI_REGISTER_PM1_STATUS                0x01
+#define ACPI_REGISTER_PM1_ENABLE                0x02
+#define ACPI_REGISTER_PM1_CONTROL               0x03
+#define ACPI_REGISTER_PM1A_CONTROL              0x04
+#define ACPI_REGISTER_PM1B_CONTROL              0x05
+#define ACPI_REGISTER_PM2_CONTROL               0x06
+#define ACPI_REGISTER_PM_TIMER                  0x07
+#define ACPI_REGISTER_PROCESSOR_BLOCK           0x08
+#define ACPI_REGISTER_SMI_COMMAND_BLOCK         0x09
+
+/* Masks used to access the bit_registers */
+
+#define ACPI_BITMASK_TIMER_STATUS               0x0001
+#define ACPI_BITMASK_BUS_MASTER_STATUS          0x0010
+#define ACPI_BITMASK_GLOBAL_LOCK_STATUS         0x0020
+#define ACPI_BITMASK_POWER_BUTTON_STATUS        0x0100
+#define ACPI_BITMASK_SLEEP_BUTTON_STATUS        0x0200
+#define ACPI_BITMASK_RT_CLOCK_STATUS            0x0400
+#define ACPI_BITMASK_PCIEXP_WAKE_STATUS         0x4000  /* ACPI 3.0 */
+#define ACPI_BITMASK_WAKE_STATUS                0x8000
+
+#define ACPI_BITMASK_ALL_FIXED_STATUS           (\
+        ACPI_BITMASK_TIMER_STATUS          | \
+        ACPI_BITMASK_BUS_MASTER_STATUS     | \
+        ACPI_BITMASK_GLOBAL_LOCK_STATUS    | \
+        ACPI_BITMASK_POWER_BUTTON_STATUS   | \
+        ACPI_BITMASK_SLEEP_BUTTON_STATUS   | \
+        ACPI_BITMASK_RT_CLOCK_STATUS       | \
+        ACPI_BITMASK_WAKE_STATUS)
+
+#define ACPI_BITMASK_TIMER_ENABLE               0x0001
+#define ACPI_BITMASK_GLOBAL_LOCK_ENABLE         0x0020
+#define ACPI_BITMASK_POWER_BUTTON_ENABLE        0x0100
+#define ACPI_BITMASK_SLEEP_BUTTON_ENABLE        0x0200
+#define ACPI_BITMASK_RT_CLOCK_ENABLE            0x0400
+#define ACPI_BITMASK_PCIEXP_WAKE_DISABLE        0x4000  /* ACPI 3.0 */
+
+#define ACPI_BITMASK_SCI_ENABLE                 0x0001
+#define ACPI_BITMASK_BUS_MASTER_RLD             0x0002
+#define ACPI_BITMASK_GLOBAL_LOCK_RELEASE        0x0004
+#define ACPI_BITMASK_SLEEP_TYPE_X               0x1C00
+#define ACPI_BITMASK_SLEEP_ENABLE               0x2000
+
+#define ACPI_BITMASK_ARB_DISABLE                0x0001
+
+/* Raw bit position of each bit_register */
+
+#define ACPI_BITPOSITION_TIMER_STATUS           0x00
+#define ACPI_BITPOSITION_BUS_MASTER_STATUS      0x04
+#define ACPI_BITPOSITION_GLOBAL_LOCK_STATUS     0x05
+#define ACPI_BITPOSITION_POWER_BUTTON_STATUS    0x08
+#define ACPI_BITPOSITION_SLEEP_BUTTON_STATUS    0x09
+#define ACPI_BITPOSITION_RT_CLOCK_STATUS        0x0A
+#define ACPI_BITPOSITION_PCIEXP_WAKE_STATUS     0x0E    /* ACPI 3.0 */
+#define ACPI_BITPOSITION_WAKE_STATUS            0x0F
+
+#define ACPI_BITPOSITION_TIMER_ENABLE           0x00
+#define ACPI_BITPOSITION_GLOBAL_LOCK_ENABLE     0x05
+#define ACPI_BITPOSITION_POWER_BUTTON_ENABLE    0x08
+#define ACPI_BITPOSITION_SLEEP_BUTTON_ENABLE    0x09
+#define ACPI_BITPOSITION_RT_CLOCK_ENABLE        0x0A
+#define ACPI_BITPOSITION_PCIEXP_WAKE_DISABLE    0x0E    /* ACPI 3.0 */
+
+#define ACPI_BITPOSITION_SCI_ENABLE             0x00
+#define ACPI_BITPOSITION_BUS_MASTER_RLD         0x01
+#define ACPI_BITPOSITION_GLOBAL_LOCK_RELEASE    0x02
+#define ACPI_BITPOSITION_SLEEP_TYPE_X           0x0A
+#define ACPI_BITPOSITION_SLEEP_ENABLE           0x0D
+
+#define ACPI_BITPOSITION_ARB_DISABLE            0x00
+
+/*****************************************************************************
+ *
+ * Resource descriptors
+ *
+ ****************************************************************************/
+
+/* resource_type values */
+
+#define ACPI_ADDRESS_TYPE_MEMORY_RANGE          0
+#define ACPI_ADDRESS_TYPE_IO_RANGE              1
+#define ACPI_ADDRESS_TYPE_BUS_NUMBER_RANGE      2
+
+/* Resource descriptor types and masks */
+
+#define ACPI_RESOURCE_NAME_LARGE                0x80
+#define ACPI_RESOURCE_NAME_SMALL                0x00
+
+#define ACPI_RESOURCE_NAME_SMALL_MASK           0x78    /* Bits 6:3 contain the type */
+#define ACPI_RESOURCE_NAME_SMALL_LENGTH_MASK    0x07    /* Bits 2:0 contain the length */
+#define ACPI_RESOURCE_NAME_LARGE_MASK           0x7F    /* Bits 6:0 contain the type */
+
+/*
+ * Small resource descriptor "names" as defined by the ACPI specification.
+ * Note: Bits 2:0 are used for the descriptor length
+ */
+#define ACPI_RESOURCE_NAME_IRQ                  0x20
+#define ACPI_RESOURCE_NAME_DMA                  0x28
+#define ACPI_RESOURCE_NAME_START_DEPENDENT      0x30
+#define ACPI_RESOURCE_NAME_END_DEPENDENT        0x38
+#define ACPI_RESOURCE_NAME_IO                   0x40
+#define ACPI_RESOURCE_NAME_FIXED_IO             0x48
+#define ACPI_RESOURCE_NAME_RESERVED_S1          0x50
+#define ACPI_RESOURCE_NAME_RESERVED_S2          0x58
+#define ACPI_RESOURCE_NAME_RESERVED_S3          0x60
+#define ACPI_RESOURCE_NAME_RESERVED_S4          0x68
+#define ACPI_RESOURCE_NAME_VENDOR_SMALL         0x70
+#define ACPI_RESOURCE_NAME_END_TAG              0x78
+
+/*
+ * Large resource descriptor "names" as defined by the ACPI specification.
+ * Note: includes the Large Descriptor bit in bit[7]
+ */
+#define ACPI_RESOURCE_NAME_MEMORY24             0x81
+#define ACPI_RESOURCE_NAME_GENERIC_REGISTER     0x82
+#define ACPI_RESOURCE_NAME_RESERVED_L1          0x83
+#define ACPI_RESOURCE_NAME_VENDOR_LARGE         0x84
+#define ACPI_RESOURCE_NAME_MEMORY32             0x85
+#define ACPI_RESOURCE_NAME_FIXED_MEMORY32       0x86
+#define ACPI_RESOURCE_NAME_ADDRESS32            0x87
+#define ACPI_RESOURCE_NAME_ADDRESS16            0x88
+#define ACPI_RESOURCE_NAME_EXTENDED_IRQ         0x89
+#define ACPI_RESOURCE_NAME_ADDRESS64            0x8A
+#define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B
+#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8B
+
+/*****************************************************************************
+ *
+ * Miscellaneous
+ *
+ ****************************************************************************/
+
+#define ACPI_ASCII_ZERO                 0x30
+
+/*****************************************************************************
+ *
+ * Debugger
+ *
+ ****************************************************************************/
+
+struct acpi_db_method_info {
+        acpi_handle main_thread_gate;
+        acpi_handle thread_complete_gate;
+        u32 *threads;
+        u32 num_threads;
+        u32 num_created;
+        u32 num_completed;
+
+        char *name;
+        u32 flags;
+        u32 num_loops;
+        char pathname[128];
+        char **args;
+
+        /*
+         * Arguments to be passed to method for the command
+         * Threads -
+         *   the Number of threads, ID of current thread and
+         *   Index of current thread inside all them created.
+         */
+        char init_args;
+        char *arguments[4];
+        char num_threads_str[11];
+        char id_of_thread_str[11];
+        char index_of_thread_str[11];
+};
+
+struct acpi_integrity_info {
+        u32 nodes;
+        u32 objects;
+};
+
+#define ACPI_DB_REDIRECTABLE_OUTPUT     0x01
+#define ACPI_DB_CONSOLE_OUTPUT          0x02
+#define ACPI_DB_DUPLICATE_OUTPUT        0x03
+
+/*****************************************************************************
+ *
+ * Debug
+ *
+ ****************************************************************************/
+
+/* Entry for a memory allocation (debug only) */
+
+#define ACPI_MEM_MALLOC                 0
+#define ACPI_MEM_CALLOC                 1
+#define ACPI_MAX_MODULE_NAME            16
+
+#define ACPI_COMMON_DEBUG_MEM_HEADER \
+        struct acpi_debug_mem_block     *previous; \
+        struct acpi_debug_mem_block     *next; \
+        u32                             size; \
+        u32                             component; \
+        u32                             line; \
+        char                            module[ACPI_MAX_MODULE_NAME]; \
+        u8                              alloc_type;
+
+struct acpi_debug_mem_header {
+ACPI_COMMON_DEBUG_MEM_HEADER};
+
+struct acpi_debug_mem_block {
+        ACPI_COMMON_DEBUG_MEM_HEADER u64 user_space;
+};
+
+#define ACPI_MEM_LIST_GLOBAL            0
+#define ACPI_MEM_LIST_NSNODE            1
+#define ACPI_MEM_LIST_MAX               1
+#define ACPI_NUM_MEM_LISTS              2
+
+#endif                          /* __ACLOCAL_H__ */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
new file mode 100644
index 000000000000..9c127e8e2d6d
--- /dev/null
+++ b/drivers/acpi/acpica/acmacros.h
@@ -0,0 +1,577 @@
+/******************************************************************************
+ *
+ * Name: acmacros.h - C macros for the entire subsystem.
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACMACROS_H__
+#define __ACMACROS_H__
+
+/*
+ * Extract data using a pointer. Any more than a byte and we
+ * get into potential aligment issues -- see the STORE macros below.
+ * Use with care.
+ */
+#define ACPI_GET8(ptr)                  *ACPI_CAST_PTR (u8, ptr)
+#define ACPI_GET16(ptr)                 *ACPI_CAST_PTR (u16, ptr)
+#define ACPI_GET32(ptr)                 *ACPI_CAST_PTR (u32, ptr)
+#define ACPI_GET64(ptr)                 *ACPI_CAST_PTR (u64, ptr)
+#define ACPI_SET8(ptr)                  *ACPI_CAST_PTR (u8, ptr)
+#define ACPI_SET16(ptr)                 *ACPI_CAST_PTR (u16, ptr)
+#define ACPI_SET32(ptr)                 *ACPI_CAST_PTR (u32, ptr)
+#define ACPI_SET64(ptr)                 *ACPI_CAST_PTR (u64, ptr)
+
+/*
+ * printf() format helpers
+ */
+
+/* Split 64-bit integer into two 32-bit values. Use with %8.8_x%8.8_x */
+
+#define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)
+
+#if ACPI_MACHINE_WIDTH == 64
+#define ACPI_FORMAT_NATIVE_UINT(i)      ACPI_FORMAT_UINT64(i)
+#else
+#define ACPI_FORMAT_NATIVE_UINT(i)      0, (i)
+#endif
+
+/*
+ * Macros for moving data around to/from buffers that are possibly unaligned.
+ * If the hardware supports the transfer of unaligned data, just do the store.
+ * Otherwise, we have to move one byte at a time.
+ */
+#ifdef ACPI_BIG_ENDIAN
+/*
+ * Macros for big-endian machines
+ */
+
+/* These macros reverse the bytes during the move, converting little-endian to big endian */
+
+                          /* Big Endian      <==        Little Endian */
+                          /*  Hi...Lo                     Lo...Hi     */
+/* 16-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_16_TO_16(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[1];\
+                                           ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
+
+#define ACPI_MOVE_16_TO_32(d, s)        {(*(u32 *)(void *)(d))=0;\
+                                                           ((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                                           ((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+
+#define ACPI_MOVE_16_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
+                                                                         ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
+                                                                         ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
+
+/* 32-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+
+#define ACPI_MOVE_32_TO_32(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[3];\
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
+                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+
+#define ACPI_MOVE_32_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
+                                                                                   ((u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
+                                                                                   ((u8 *)(void *)(d))[5] = ((u8 *)(void *)(s))[2];\
+                                                                                   ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
+                                                                                   ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
+
+/* 64-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+
+#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)        /* Truncate to 32 */
+
+#define ACPI_MOVE_64_TO_64(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[7];\
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[6];\
+                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[5];\
+                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[4];\
+                                                                                 ((  u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
+                                                                                 ((  u8 *)(void *)(d))[5] = ((u8 *)(void *)(s))[2];\
+                                                                                 ((  u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
+                                                                                 ((  u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
+#else
+/*
+ * Macros for little-endian machines
+ */
+
+#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
+
+/* The hardware supports unaligned transfers, just do the little-endian move */
+
+/* 16-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_16_TO_16(d, s)        *(u16 *)(void *)(d) = *(u16 *)(void *)(s)
+#define ACPI_MOVE_16_TO_32(d, s)        *(u32 *)(void *)(d) = *(u16 *)(void *)(s)
+#define ACPI_MOVE_16_TO_64(d, s)        *(u64 *)(void *)(d) = *(u16 *)(void *)(s)
+
+/* 32-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+#define ACPI_MOVE_32_TO_32(d, s)        *(u32 *)(void *)(d) = *(u32 *)(void *)(s)
+#define ACPI_MOVE_32_TO_64(d, s)        *(u64 *)(void *)(d) = *(u32 *)(void *)(s)
+
+/* 64-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)        /* Truncate to 32 */
+#define ACPI_MOVE_64_TO_64(d, s)        *(u64 *)(void *)(d) = *(u64 *)(void *)(s)
+
+#else
+/*
+ * The hardware does not support unaligned transfers. We must move the
+ * data one byte at a time. These macros work whether the source or
+ * the destination (or both) is/are unaligned. (Little-endian move)
+ */
+
+/* 16-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_16_TO_16(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[0];\
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[1];}
+
+#define ACPI_MOVE_16_TO_32(d, s)        {(*(u32 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
+#define ACPI_MOVE_16_TO_64(d, s)        {(*(u64 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
+
+/* 32-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+
+#define ACPI_MOVE_32_TO_32(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[0];\
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[1];\
+                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[2];\
+                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[3];}
+
+#define ACPI_MOVE_32_TO_64(d, s)        {(*(u64 *)(void *)(d)) = 0; ACPI_MOVE_32_TO_32(d, s);}
+
+/* 64-bit source, 16/32/64 destination */
+
+#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
+#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)        /* Truncate to 32 */
+#define ACPI_MOVE_64_TO_64(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[0];\
+                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[1];\
+                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[2];\
+                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[3];\
+                                                                                 ((  u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[4];\
+                                                                                 ((  u8 *)(void *)(d))[5] = ((u8 *)(void *)(s))[5];\
+                                                                                 ((  u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[6];\
+                                                                                 ((  u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[7];}
+#endif
+#endif
+
+/* Macros based on machine integer width */
+
+#if ACPI_MACHINE_WIDTH == 32
+#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_32_TO_16(d, s)
+
+#elif ACPI_MACHINE_WIDTH == 64
+#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_64_TO_16(d, s)
+
+#else
+#error unknown ACPI_MACHINE_WIDTH
+#endif
+
+/*
+ * Fast power-of-two math macros for non-optimized compilers
+ */
+#define _ACPI_DIV(value, power_of2)      ((u32) ((value) >> (power_of2)))
+#define _ACPI_MUL(value, power_of2)      ((u32) ((value) << (power_of2)))
+#define _ACPI_MOD(value, divisor)        ((u32) ((value) & ((divisor) -1)))
+
+#define ACPI_DIV_2(a)                   _ACPI_DIV(a, 1)
+#define ACPI_MUL_2(a)                   _ACPI_MUL(a, 1)
+#define ACPI_MOD_2(a)                   _ACPI_MOD(a, 2)
+
+#define ACPI_DIV_4(a)                   _ACPI_DIV(a, 2)
+#define ACPI_MUL_4(a)                   _ACPI_MUL(a, 2)
+#define ACPI_MOD_4(a)                   _ACPI_MOD(a, 4)
+
+#define ACPI_DIV_8(a)                   _ACPI_DIV(a, 3)
+#define ACPI_MUL_8(a)                   _ACPI_MUL(a, 3)
+#define ACPI_MOD_8(a)                   _ACPI_MOD(a, 8)
+
+#define ACPI_DIV_16(a)                  _ACPI_DIV(a, 4)
+#define ACPI_MUL_16(a)                  _ACPI_MUL(a, 4)
+#define ACPI_MOD_16(a)                  _ACPI_MOD(a, 16)
+
+#define ACPI_DIV_32(a)                  _ACPI_DIV(a, 5)
+#define ACPI_MUL_32(a)                  _ACPI_MUL(a, 5)
+#define ACPI_MOD_32(a)                  _ACPI_MOD(a, 32)
+
+/*
+ * Rounding macros (Power of two boundaries only)
+ */
+#define ACPI_ROUND_DOWN(value, boundary)     (((acpi_size)(value)) & \
+                                                (~(((acpi_size) boundary)-1)))
+
+#define ACPI_ROUND_UP(value, boundary)       ((((acpi_size)(value)) + \
+                                                (((acpi_size) boundary)-1)) & \
+                                                (~(((acpi_size) boundary)-1)))
+
+/* Note: sizeof(acpi_size) evaluates to either 4 or 8 (32- vs 64-bit mode) */
+
+#define ACPI_ROUND_DOWN_TO_32BIT(a)         ACPI_ROUND_DOWN(a, 4)
+#define ACPI_ROUND_DOWN_TO_64BIT(a)         ACPI_ROUND_DOWN(a, 8)
+#define ACPI_ROUND_DOWN_TO_NATIVE_WORD(a)   ACPI_ROUND_DOWN(a, sizeof(acpi_size))
+
+#define ACPI_ROUND_UP_TO_32BIT(a)           ACPI_ROUND_UP(a, 4)
+#define ACPI_ROUND_UP_TO_64BIT(a)           ACPI_ROUND_UP(a, 8)
+#define ACPI_ROUND_UP_TO_NATIVE_WORD(a)     ACPI_ROUND_UP(a, sizeof(acpi_size))
+
+#define ACPI_ROUND_BITS_UP_TO_BYTES(a)      ACPI_DIV_8((a) + 7)
+#define ACPI_ROUND_BITS_DOWN_TO_BYTES(a)    ACPI_DIV_8((a))
+
+#define ACPI_ROUND_UP_TO_1K(a)              (((a) + 1023) >> 10)
+
+/* Generic (non-power-of-two) rounding */
+
+#define ACPI_ROUND_UP_TO(value, boundary)   (((value) + ((boundary)-1)) / (boundary))
+
+#define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) & (sizeof(acpi_size)-1))
+
+/*
+ * Bitmask creation
+ * Bit positions start at zero.
+ * MASK_BITS_ABOVE creates a mask starting AT the position and above
+ * MASK_BITS_BELOW creates a mask starting one bit BELOW the position
+ */
+#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_INTEGER_MAX) << ((u32) (position))))
+#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_INTEGER_MAX) << ((u32) (position)))
+
+/* Bitfields within ACPI registers */
+
+#define ACPI_REGISTER_PREPARE_BITS(val, pos, mask)      ((val << pos) & mask)
+#define ACPI_REGISTER_INSERT_VALUE(reg, pos, mask, val)  reg = (reg & (~(mask))) | ACPI_REGISTER_PREPARE_BITS(val, pos, mask)
+
+#define ACPI_INSERT_BITS(target, mask, source)          target = ((target & (~(mask))) | (source & mask))
+
+/*
+ * A struct acpi_namespace_node can appear in some contexts
+ * where a pointer to a union acpi_operand_object can also
+ * appear. This macro is used to distinguish them.
+ *
+ * The "Descriptor" field is the first field in both structures.
+ */
+#define ACPI_GET_DESCRIPTOR_TYPE(d)     (((union acpi_descriptor *)(void *)(d))->common.descriptor_type)
+#define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t)
+
+/* Macro to test the object type */
+
+#define ACPI_GET_OBJECT_TYPE(d)         (((union acpi_operand_object *)(void *)(d))->common.type)
+
+/*
+ * Macros for the master AML opcode table
+ */
+#if defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUG_OUTPUT)
+#define ACPI_OP(name, Pargs, Iargs, obj_type, class, type, flags) \
+        {name, (u32)(Pargs), (u32)(Iargs), (u32)(flags), obj_type, class, type}
+#else
+#define ACPI_OP(name, Pargs, Iargs, obj_type, class, type, flags) \
+        {(u32)(Pargs), (u32)(Iargs), (u32)(flags), obj_type, class, type}
+#endif
+
+#define ARG_TYPE_WIDTH                  5
+#define ARG_1(x)                        ((u32)(x))
+#define ARG_2(x)                        ((u32)(x) << (1 * ARG_TYPE_WIDTH))
+#define ARG_3(x)                        ((u32)(x) << (2 * ARG_TYPE_WIDTH))
+#define ARG_4(x)                        ((u32)(x) << (3 * ARG_TYPE_WIDTH))
+#define ARG_5(x)                        ((u32)(x) << (4 * ARG_TYPE_WIDTH))
+#define ARG_6(x)                        ((u32)(x) << (5 * ARG_TYPE_WIDTH))
+
+#define ARGI_LIST1(a)                   (ARG_1(a))
+#define ARGI_LIST2(a, b)                (ARG_1(b)|ARG_2(a))
+#define ARGI_LIST3(a, b, c)             (ARG_1(c)|ARG_2(b)|ARG_3(a))
+#define ARGI_LIST4(a, b, c, d)          (ARG_1(d)|ARG_2(c)|ARG_3(b)|ARG_4(a))
+#define ARGI_LIST5(a, b, c, d, e)       (ARG_1(e)|ARG_2(d)|ARG_3(c)|ARG_4(b)|ARG_5(a))
+#define ARGI_LIST6(a, b, c, d, e, f)    (ARG_1(f)|ARG_2(e)|ARG_3(d)|ARG_4(c)|ARG_5(b)|ARG_6(a))
+
+#define ARGP_LIST1(a)                   (ARG_1(a))
+#define ARGP_LIST2(a, b)                (ARG_1(a)|ARG_2(b))
+#define ARGP_LIST3(a, b, c)             (ARG_1(a)|ARG_2(b)|ARG_3(c))
+#define ARGP_LIST4(a, b, c, d)          (ARG_1(a)|ARG_2(b)|ARG_3(c)|ARG_4(d))
+#define ARGP_LIST5(a, b, c, d, e)       (ARG_1(a)|ARG_2(b)|ARG_3(c)|ARG_4(d)|ARG_5(e))
+#define ARGP_LIST6(a, b, c, d, e, f)    (ARG_1(a)|ARG_2(b)|ARG_3(c)|ARG_4(d)|ARG_5(e)|ARG_6(f))
+
+#define GET_CURRENT_ARG_TYPE(list)      (list & ((u32) 0x1F))
+#define INCREMENT_ARG_LIST(list)        (list >>= ((u32) ARG_TYPE_WIDTH))
+
+/*
+ * Ascii error messages can be configured out
+ */
+#ifndef ACPI_NO_ERROR_MESSAGES
+
+/*
+ * Error reporting. Callers module and line number are inserted by AE_INFO,
+ * the plist contains a set of parens to allow variable-length lists.
+ * These macros are used for both the debug and non-debug versions of the code.
+ */
+#define ACPI_ERROR_NAMESPACE(s, e)      acpi_ns_report_error (AE_INFO, s, e);
+#define ACPI_ERROR_METHOD(s, n, p, e)   acpi_ns_report_method_error (AE_INFO, s, n, p, e);
+
+#else
+
+/* No error messages */
+
+#define ACPI_ERROR_NAMESPACE(s, e)
+#define ACPI_ERROR_METHOD(s, n, p, e)
+#endif          /* ACPI_NO_ERROR_MESSAGES */
+
+/*
+ * Debug macros that are conditionally compiled
+ */
+#ifdef ACPI_DEBUG_OUTPUT
+
+/*
+ * Function entry tracing
+ */
+#ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
+
+#define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \
+                          acpi_ut_trace(ACPI_DEBUG_PARAMETERS)
+#define ACPI_FUNCTION_TRACE_PTR(a, b)   ACPI_FUNCTION_NAME(a) \
+                                           acpi_ut_trace_ptr(ACPI_DEBUG_PARAMETERS, (void *)b)
+#define ACPI_FUNCTION_TRACE_U32(a, b)   ACPI_FUNCTION_NAME(a) \
+                                                         acpi_ut_trace_u32(ACPI_DEBUG_PARAMETERS, (u32)b)
+#define ACPI_FUNCTION_TRACE_STR(a, b)   ACPI_FUNCTION_NAME(a) \
+                                                                          acpi_ut_trace_str(ACPI_DEBUG_PARAMETERS, (char *)b)
+
+#define ACPI_FUNCTION_ENTRY()           acpi_ut_track_stack_ptr()
+
+/*
+ * Function exit tracing.
+ * WARNING: These macros include a return statement. This is usually considered
+ * bad form, but having a separate exit macro is very ugly and difficult to maintain.
+ * One of the FUNCTION_TRACE macros above must be used in conjunction with these macros
+ * so that "_AcpiFunctionName" is defined.
+ *
+ * Note: the DO_WHILE0 macro is used to prevent some compilers from complaining
+ * about these constructs.
+ */
+#ifdef ACPI_USE_DO_WHILE_0
+#define ACPI_DO_WHILE0(a)               do a while(0)
+#else
+#define ACPI_DO_WHILE0(a)               a
+#endif
+
+#define return_VOID                     ACPI_DO_WHILE0 ({ \
+                                                                                        acpi_ut_exit (ACPI_DEBUG_PARAMETERS); \
+                                                                                        return;})
+/*
+ * There are two versions of most of the return macros. The default version is
+ * safer, since it avoids side-effects by guaranteeing that the argument will
+ * not be evaluated twice.
+ *
+ * A less-safe version of the macros is provided for optional use if the
+ * compiler uses excessive CPU stack (for example, this may happen in the
+ * debug case if code optimzation is disabled.)
+ */
+#ifndef ACPI_SIMPLE_RETURN_MACROS
+
+#define return_ACPI_STATUS(s)           ACPI_DO_WHILE0 ({ \
+                                                                                        register acpi_status _s = (s); \
+                                                                                        acpi_ut_status_exit (ACPI_DEBUG_PARAMETERS, _s); \
+                                                                                        return (_s); })
+#define return_PTR(s)                   ACPI_DO_WHILE0 ({ \
+                                                                                        register void *_s = (void *) (s); \
+                                                                                        acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) _s); \
+                                                                                        return (_s); })
+#define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
+                                                                                        register acpi_integer _s = (s); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, _s); \
+                                                                                        return (_s); })
+#define return_UINT8(s)                 ACPI_DO_WHILE0 ({ \
+                                                                                        register u8 _s = (u8) (s); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+                                                                                        return (_s); })
+#define return_UINT32(s)                ACPI_DO_WHILE0 ({ \
+                                                                                        register u32 _s = (u32) (s); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+                                                                                        return (_s); })
+#else                           /* Use original less-safe macros */
+
+#define return_ACPI_STATUS(s)           ACPI_DO_WHILE0 ({ \
+                                                                                        acpi_ut_status_exit (ACPI_DEBUG_PARAMETERS, (s)); \
+                                                                                        return((s)); })
+#define return_PTR(s)                   ACPI_DO_WHILE0 ({ \
+                                                                                        acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) (s)); \
+                                                                                        return((s)); })
+#define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) (s)); \
+                                                                                        return((s)); })
+#define return_UINT8(s)                 return_VALUE(s)
+#define return_UINT32(s)                return_VALUE(s)
+
+#endif                          /* ACPI_SIMPLE_RETURN_MACROS */
+
+#else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */
+
+#define ACPI_FUNCTION_TRACE(a)
+#define ACPI_FUNCTION_TRACE_PTR(a,b)
+#define ACPI_FUNCTION_TRACE_U32(a,b)
+#define ACPI_FUNCTION_TRACE_STR(a,b)
+#define ACPI_FUNCTION_EXIT
+#define ACPI_FUNCTION_STATUS_EXIT(s)
+#define ACPI_FUNCTION_VALUE_EXIT(s)
+#define ACPI_FUNCTION_TRACE(a)
+#define ACPI_FUNCTION_ENTRY()
+
+#define return_VOID                     return
+#define return_ACPI_STATUS(s)           return(s)
+#define return_VALUE(s)                 return(s)
+#define return_UINT8(s)                 return(s)
+#define return_UINT32(s)                return(s)
+#define return_PTR(s)                   return(s)
+
+#endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */
+
+/* Conditional execution */
+
+#define ACPI_DEBUG_EXEC(a)              a
+#define ACPI_NORMAL_EXEC(a)
+
+#define ACPI_DEBUG_DEFINE(a)            a;
+#define ACPI_DEBUG_ONLY_MEMBERS(a)      a;
+#define _VERBOSE_STRUCTURES
+
+/* Stack and buffer dumping */
+
+#define ACPI_DUMP_STACK_ENTRY(a)        acpi_ex_dump_operand((a), 0)
+#define ACPI_DUMP_OPERANDS(a, b, c)     acpi_ex_dump_operands(a, b, c)
+
+#define ACPI_DUMP_ENTRY(a, b)           acpi_ns_dump_entry (a, b)
+#define ACPI_DUMP_PATHNAME(a, b, c, d)  acpi_ns_dump_pathname(a, b, c, d)
+#define ACPI_DUMP_RESOURCE_LIST(a)      acpi_rs_dump_resource_list(a)
+#define ACPI_DUMP_BUFFER(a, b)          acpi_ut_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
+
+#else
+/*
+ * This is the non-debug case -- make everything go away,
+ * leaving no executable debug code!
+ */
+#define ACPI_DEBUG_EXEC(a)
+#define ACPI_NORMAL_EXEC(a)             a;
+
+#define ACPI_DEBUG_DEFINE(a)            do { } while(0)
+#define ACPI_DEBUG_ONLY_MEMBERS(a)      do { } while(0)
+#define ACPI_FUNCTION_TRACE(a)          do { } while(0)
+#define ACPI_FUNCTION_TRACE_PTR(a, b)   do { } while(0)
+#define ACPI_FUNCTION_TRACE_U32(a, b)   do { } while(0)
+#define ACPI_FUNCTION_TRACE_STR(a, b)   do { } while(0)
+#define ACPI_FUNCTION_EXIT              do { } while(0)
+#define ACPI_FUNCTION_STATUS_EXIT(s)    do { } while(0)
+#define ACPI_FUNCTION_VALUE_EXIT(s)     do { } while(0)
+#define ACPI_FUNCTION_ENTRY()           do { } while(0)
+#define ACPI_DUMP_STACK_ENTRY(a)        do { } while(0)
+#define ACPI_DUMP_OPERANDS(a, b, c)     do { } while(0)
+#define ACPI_DUMP_ENTRY(a, b)           do { } while(0)
+#define ACPI_DUMP_TABLES(a, b)          do { } while(0)
+#define ACPI_DUMP_PATHNAME(a, b, c, d)  do { } while(0)
+#define ACPI_DUMP_RESOURCE_LIST(a)      do { } while(0)
+#define ACPI_DUMP_BUFFER(a, b)          do { } while(0)
+
+#define return_VOID                     return
+#define return_ACPI_STATUS(s)           return(s)
+#define return_VALUE(s)                 return(s)
+#define return_UINT8(s)                 return(s)
+#define return_UINT32(s)                return(s)
+#define return_PTR(s)                   return(s)
+
+#endif                          /* ACPI_DEBUG_OUTPUT */
+
+/*
+ * Some code only gets executed when the debugger is built in.
+ * Note that this is entirely independent of whether the
+ * DEBUG_PRINT stuff (set by ACPI_DEBUG_OUTPUT) is on, or not.
+ */
+#ifdef ACPI_DEBUGGER
+#define ACPI_DEBUGGER_EXEC(a)           a
+#else
+#define ACPI_DEBUGGER_EXEC(a)
+#endif
+
+#ifdef ACPI_DEBUG_OUTPUT
+/*
+ * 1) Set name to blanks
+ * 2) Copy the object name
+ */
+#define ACPI_ADD_OBJECT_NAME(a,b)       ACPI_MEMSET (a->common.name, ' ', sizeof (a->common.name));\
+                                                                                ACPI_STRNCPY (a->common.name, acpi_gbl_ns_type_names[b], sizeof (a->common.name))
+#else
+
+#define ACPI_ADD_OBJECT_NAME(a,b)
+#endif
+
+/*
+ * Memory allocation tracking (DEBUG ONLY)
+ */
+#define ACPI_MEM_PARAMETERS         _COMPONENT, _acpi_module_name, __LINE__
+
+#ifndef ACPI_DBG_TRACK_ALLOCATIONS
+
+/* Memory allocation */
+
+#ifndef ACPI_ALLOCATE
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#endif
+#ifndef ACPI_ALLOCATE_ZEROED
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#endif
+#ifndef ACPI_FREE
+#define ACPI_FREE(a)                acpio_os_free(a)
+#endif
+#define ACPI_MEM_TRACKING(a)
+
+#else
+
+/* Memory allocation */
+
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_FREE(a)                acpi_ut_free_and_track(a, ACPI_MEM_PARAMETERS)
+#define ACPI_MEM_TRACKING(a)        a
+
+#endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
+
+/* Preemption point */
+#ifndef ACPI_PREEMPTION_POINT
+#define ACPI_PREEMPTION_POINT() /* no preemption */
+#endif
+
+#endif                          /* ACMACROS_H */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
new file mode 100644
index 000000000000..46cb5b46d280
--- /dev/null
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -0,0 +1,324 @@
+/******************************************************************************
+ *
+ * Name: acnamesp.h - Namespace subcomponent prototypes and defines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACNAMESP_H__
+#define __ACNAMESP_H__
+
+/* To search the entire name space, pass this as search_base */
+
+#define ACPI_NS_ALL                 ((acpi_handle)0)
+
+/*
+ * Elements of acpi_ns_properties are bit significant
+ * and should be one-to-one with values of acpi_object_type
+ */
+#define ACPI_NS_NORMAL              0
+#define ACPI_NS_NEWSCOPE            1   /* a definition of this type opens a name scope */
+#define ACPI_NS_LOCAL               2   /* suppress search of enclosing scopes */
+
+/* Flags for acpi_ns_lookup, acpi_ns_search_and_enter */
+
+#define ACPI_NS_NO_UPSEARCH         0
+#define ACPI_NS_SEARCH_PARENT       0x01
+#define ACPI_NS_DONT_OPEN_SCOPE     0x02
+#define ACPI_NS_NO_PEER_SEARCH      0x04
+#define ACPI_NS_ERROR_IF_FOUND      0x08
+#define ACPI_NS_PREFIX_IS_SCOPE     0x10
+#define ACPI_NS_EXTERNAL            0x20
+#define ACPI_NS_TEMPORARY           0x40
+
+/* Flags for acpi_ns_walk_namespace */
+
+#define ACPI_NS_WALK_NO_UNLOCK      0
+#define ACPI_NS_WALK_UNLOCK         0x01
+#define ACPI_NS_WALK_TEMP_NODES     0x02
+
+/*
+ * nsinit - Namespace initialization
+ */
+acpi_status acpi_ns_initialize_objects(void);
+
+acpi_status acpi_ns_initialize_devices(void);
+
+/*
+ * nsload -  Namespace loading
+ */
+acpi_status acpi_ns_load_namespace(void);
+
+acpi_status
+acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node);
+
+/*
+ * nswalk - walk the namespace
+ */
+acpi_status
+acpi_ns_walk_namespace(acpi_object_type type,
+                       acpi_handle start_object,
+                       u32 max_depth,
+                       u32 flags,
+                       acpi_walk_callback user_function,
+                       void *context, void **return_value);
+
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                  *parent, struct acpi_namespace_node
+                                                  *child);
+
+/*
+ * nsparse - table parsing
+ */
+acpi_status
+acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node);
+
+acpi_status
+acpi_ns_one_complete_parse(u32 pass_number,
+                           u32 table_index,
+                           struct acpi_namespace_node *start_node);
+
+/*
+ * nsaccess - Top-level namespace access
+ */
+acpi_status acpi_ns_root_initialize(void);
+
+acpi_status
+acpi_ns_lookup(union acpi_generic_state *scope_info,
+               char *name,
+               acpi_object_type type,
+               acpi_interpreter_mode interpreter_mode,
+               u32 flags,
+               struct acpi_walk_state *walk_state,
+               struct acpi_namespace_node **ret_node);
+
+/*
+ * nsalloc - Named object allocation/deallocation
+ */
+struct acpi_namespace_node *acpi_ns_create_node(u32 name);
+
+void acpi_ns_delete_node(struct acpi_namespace_node *node);
+
+void
+acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_handle);
+
+void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id);
+
+void acpi_ns_detach_object(struct acpi_namespace_node *node);
+
+void acpi_ns_delete_children(struct acpi_namespace_node *parent);
+
+int acpi_ns_compare_names(char *name1, char *name2);
+
+/*
+ * nsdump - Namespace dump/print utilities
+ */
+#ifdef  ACPI_FUTURE_USAGE
+void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+void acpi_ns_dump_entry(acpi_handle handle, u32 debug_level);
+
+void
+acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component);
+
+void acpi_ns_print_pathname(u32 num_segments, char *pathname);
+
+acpi_status
+acpi_ns_dump_one_object(acpi_handle obj_handle,
+                        u32 level, void *context, void **return_value);
+
+#ifdef  ACPI_FUTURE_USAGE
+void
+acpi_ns_dump_objects(acpi_object_type type,
+                     u8 display_type,
+                     u32 max_depth,
+                     acpi_owner_id owner_id, acpi_handle start_handle);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+/*
+ * nseval - Namespace evaluation functions
+ */
+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info);
+
+/*
+ * nspredef - Support for predefined/reserved names
+ */
+acpi_status
+acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
+                               u32 user_param_count,
+                               acpi_status return_status,
+                               union acpi_operand_object **return_object);
+
+const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
+                                                                    acpi_namespace_node
+                                                                    *node);
+
+void
+acpi_ns_check_parameter_count(char *pathname,
+                              struct acpi_namespace_node *node,
+                              u32 user_param_count,
+                              const union acpi_predefined_info *info);
+
+/*
+ * nsnames - Name and Scope manipulation
+ */
+u32 acpi_ns_opens_scope(acpi_object_type type);
+
+acpi_status
+acpi_ns_build_external_path(struct acpi_namespace_node *node,
+                            acpi_size size, char *name_buffer);
+
+char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node);
+
+char *acpi_ns_name_of_current_scope(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ns_handle_to_pathname(acpi_handle target_handle,
+                           struct acpi_buffer *buffer);
+
+u8
+acpi_ns_pattern_match(struct acpi_namespace_node *obj_node, char *search_for);
+
+acpi_status
+acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
+                 const char *external_pathname,
+                 u32 flags, struct acpi_namespace_node **out_node);
+
+acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node);
+
+/*
+ * nsobject - Object management for namespace nodes
+ */
+acpi_status
+acpi_ns_attach_object(struct acpi_namespace_node *node,
+                      union acpi_operand_object *object, acpi_object_type type);
+
+union acpi_operand_object *acpi_ns_get_attached_object(struct
+                                                       acpi_namespace_node
+                                                       *node);
+
+union acpi_operand_object *acpi_ns_get_secondary_object(union
+                                                        acpi_operand_object
+                                                        *obj_desc);
+
+acpi_status
+acpi_ns_attach_data(struct acpi_namespace_node *node,
+                    acpi_object_handler handler, void *data);
+
+acpi_status
+acpi_ns_detach_data(struct acpi_namespace_node *node,
+                    acpi_object_handler handler);
+
+acpi_status
+acpi_ns_get_attached_data(struct acpi_namespace_node *node,
+                          acpi_object_handler handler, void **data);
+
+/*
+ * nssearch - Namespace searching and entry
+ */
+acpi_status
+acpi_ns_search_and_enter(u32 entry_name,
+                         struct acpi_walk_state *walk_state,
+                         struct acpi_namespace_node *node,
+                         acpi_interpreter_mode interpreter_mode,
+                         acpi_object_type type,
+                         u32 flags, struct acpi_namespace_node **ret_node);
+
+acpi_status
+acpi_ns_search_one_scope(u32 entry_name,
+                         struct acpi_namespace_node *node,
+                         acpi_object_type type,
+                         struct acpi_namespace_node **ret_node);
+
+void
+acpi_ns_install_node(struct acpi_walk_state *walk_state,
+                     struct acpi_namespace_node *parent_node,
+                     struct acpi_namespace_node *node, acpi_object_type type);
+
+/*
+ * nsutils - Utility functions
+ */
+u8 acpi_ns_valid_root_prefix(char prefix);
+
+acpi_object_type acpi_ns_get_type(struct acpi_namespace_node *node);
+
+u32 acpi_ns_local(acpi_object_type type);
+
+void
+acpi_ns_report_error(const char *module_name,
+                     u32 line_number,
+                     const char *internal_name, acpi_status lookup_status);
+
+void
+acpi_ns_report_method_error(const char *module_name,
+                            u32 line_number,
+                            const char *message,
+                            struct acpi_namespace_node *node,
+                            const char *path, acpi_status lookup_status);
+
+void
+acpi_ns_print_node_pathname(struct acpi_namespace_node *node, const char *msg);
+
+acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info);
+
+void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info);
+
+acpi_status
+acpi_ns_internalize_name(const char *dotted_name, char **converted_name);
+
+acpi_status
+acpi_ns_externalize_name(u32 internal_name_length,
+                         const char *internal_name,
+                         u32 * converted_name_length, char **converted_name);
+
+struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle);
+
+acpi_handle acpi_ns_convert_entry_to_handle(struct acpi_namespace_node *node);
+
+void acpi_ns_terminate(void);
+
+struct acpi_namespace_node *acpi_ns_get_parent_node(struct acpi_namespace_node
+                                                    *node);
+
+struct acpi_namespace_node *acpi_ns_get_next_valid_node(struct
+                                                        acpi_namespace_node
+                                                        *node);
+
+#endif                          /* __ACNAMESP_H__ */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
new file mode 100644
index 000000000000..eb6f038b03d9
--- /dev/null
+++ b/drivers/acpi/acpica/acobject.h
@@ -0,0 +1,446 @@
+
+/******************************************************************************
+ *
+ * Name: acobject.h - Definition of union acpi_operand_object  (Internal object only)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACOBJECT_H
+#define _ACOBJECT_H
+
+/* acpisrc:struct_defs -- for acpisrc conversion */
+
+/*
+ * The union acpi_operand_object is used to pass AML operands from the dispatcher
+ * to the interpreter, and to keep track of the various handlers such as
+ * address space handlers and notify handlers. The object is a constant
+ * size in order to allow it to be cached and reused.
+ *
+ * Note: The object is optimized to be aligned and will not work if it is
+ * byte-packed.
+ */
+#if ACPI_MACHINE_WIDTH == 64
+#pragma pack(8)
+#else
+#pragma pack(4)
+#endif
+
+/*******************************************************************************
+ *
+ * Common Descriptors
+ *
+ ******************************************************************************/
+
+/*
+ * Common area for all objects.
+ *
+ * descriptor_type is used to differentiate between internal descriptors, and
+ * must be in the same place across all descriptors
+ *
+ * Note: The descriptor_type and Type fields must appear in the identical
+ * position in both the struct acpi_namespace_node and union acpi_operand_object
+ * structures.
+ */
+#define ACPI_OBJECT_COMMON_HEADER \
+        union acpi_operand_object       *next_object;       /* Objects linked to parent NS node */\
+        u8                              descriptor_type;    /* To differentiate various internal objs */\
+        u8                              type;               /* acpi_object_type */\
+        u16                             reference_count;    /* For object deletion management */\
+        u8                              flags;
+        /*
+         * Note: There are 3 bytes available here before the
+         * next natural alignment boundary (for both 32/64 cases)
+         */
+
+/* Values for Flag byte above */
+
+#define AOPOBJ_AML_CONSTANT         0x01
+#define AOPOBJ_STATIC_POINTER       0x02
+#define AOPOBJ_DATA_VALID           0x04
+#define AOPOBJ_OBJECT_INITIALIZED   0x08
+#define AOPOBJ_SETUP_COMPLETE       0x10
+#define AOPOBJ_SINGLE_DATUM         0x20
+#define AOPOBJ_INVALID              0x40        /* Used if host OS won't allow an op_region address */
+
+/******************************************************************************
+ *
+ * Basic data types
+ *
+ *****************************************************************************/
+
+struct acpi_object_common {
+ACPI_OBJECT_COMMON_HEADER};
+
+struct acpi_object_integer {
+        ACPI_OBJECT_COMMON_HEADER u8 fill[3];   /* Prevent warning on some compilers */
+        acpi_integer value;
+};
+
+/*
+ * Note: The String and Buffer object must be identical through the Pointer
+ * and length elements.  There is code that depends on this.
+ *
+ * Fields common to both Strings and Buffers
+ */
+#define ACPI_COMMON_BUFFER_INFO(_type) \
+        _type                           *pointer; \
+        u32                             length;
+
+struct acpi_object_string {     /* Null terminated, ASCII characters only */
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_BUFFER_INFO(char) /* String in AML stream or allocated string */
+};
+
+struct acpi_object_buffer {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_BUFFER_INFO(u8)   /* Buffer in AML stream or allocated buffer */
+        u32 aml_length;
+        u8 *aml_start;
+        struct acpi_namespace_node *node;       /* Link back to parent node */
+};
+
+struct acpi_object_package {
+        ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *node;     /* Link back to parent node */
+        union acpi_operand_object **elements;   /* Array of pointers to acpi_objects */
+        u8 *aml_start;
+        u32 aml_length;
+        u32 count;              /* # of elements in package */
+};
+
+/******************************************************************************
+ *
+ * Complex data types
+ *
+ *****************************************************************************/
+
+struct acpi_object_event {
+        ACPI_OBJECT_COMMON_HEADER acpi_semaphore os_semaphore;  /* Actual OS synchronization object */
+};
+
+struct acpi_object_mutex {
+        ACPI_OBJECT_COMMON_HEADER u8 sync_level;        /* 0-15, specified in Mutex() call */
+        u16 acquisition_depth;  /* Allow multiple Acquires, same thread */
+        acpi_mutex os_mutex;    /* Actual OS synchronization object */
+        acpi_thread_id thread_id;       /* Current owner of the mutex */
+        struct acpi_thread_state *owner_thread; /* Current owner of the mutex */
+        union acpi_operand_object *prev;        /* Link for list of acquired mutexes */
+        union acpi_operand_object *next;        /* Link for list of acquired mutexes */
+        struct acpi_namespace_node *node;       /* Containing namespace node */
+        u8 original_sync_level; /* Owner's original sync level (0-15) */
+};
+
+struct acpi_object_region {
+        ACPI_OBJECT_COMMON_HEADER u8 space_id;
+        struct acpi_namespace_node *node;       /* Containing namespace node */
+        union acpi_operand_object *handler;     /* Handler for region access */
+        union acpi_operand_object *next;
+        acpi_physical_address address;
+        u32 length;
+};
+
+struct acpi_object_method {
+        ACPI_OBJECT_COMMON_HEADER u8 method_flags;
+        u8 param_count;
+        u8 sync_level;
+        union acpi_operand_object *mutex;
+        u8 *aml_start;
+        ACPI_INTERNAL_METHOD implementation;
+        u32 aml_length;
+        u8 thread_count;
+        acpi_owner_id owner_id;
+};
+
+/******************************************************************************
+ *
+ * Objects that can be notified.  All share a common notify_info area.
+ *
+ *****************************************************************************/
+
+/*
+ * Common fields for objects that support ASL notifications
+ */
+#define ACPI_COMMON_NOTIFY_INFO \
+        union acpi_operand_object       *system_notify;     /* Handler for system notifies */\
+        union acpi_operand_object       *device_notify;     /* Handler for driver notifies */\
+        union acpi_operand_object       *handler;       /* Handler for Address space */
+
+struct acpi_object_notify_common {      /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
+ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
+
+struct acpi_object_device {
+        ACPI_OBJECT_COMMON_HEADER
+            ACPI_COMMON_NOTIFY_INFO struct acpi_gpe_block_info *gpe_block;
+};
+
+struct acpi_object_power_resource {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO u32 system_level;
+        u32 resource_order;
+};
+
+struct acpi_object_processor {
+        ACPI_OBJECT_COMMON_HEADER
+            /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */
+        u8 proc_id;
+        u8 length;
+        ACPI_COMMON_NOTIFY_INFO acpi_io_address address;
+};
+
+struct acpi_object_thermal_zone {
+ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
+
+/******************************************************************************
+ *
+ * Fields.  All share a common header/info field.
+ *
+ *****************************************************************************/
+
+/*
+ * Common bitfield for the field objects
+ * "Field Datum"  -- a datum from the actual field object
+ * "Buffer Datum" -- a datum from a user buffer, read from or to be written to the field
+ */
+#define ACPI_COMMON_FIELD_INFO \
+        u8                              field_flags;        /* Access, update, and lock bits */\
+        u8                              attribute;          /* From access_as keyword */\
+        u8                              access_byte_width;  /* Read/Write size in bytes */\
+        struct acpi_namespace_node      *node;              /* Link back to parent node */\
+        u32                             bit_length;         /* Length of field in bits */\
+        u32                             base_byte_offset;   /* Byte offset within containing object */\
+        u32                             value;              /* Value to store into the Bank or Index register */\
+        u8                              start_field_bit_offset;/* Bit offset within first field datum (0-63) */\
+        u8                              access_bit_width;       /* Read/Write size in bits (8-64) */
+
+struct acpi_object_field_common {       /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Parent Operation Region object (REGION/BANK fields only) */
+};
+
+struct acpi_object_region_field {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Containing op_region object */
+};
+
+struct acpi_object_bank_field {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Containing op_region object */
+        union acpi_operand_object *bank_obj;    /* bank_select Register object */
+};
+
+struct acpi_object_index_field {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO
+            /*
+             * No "RegionObj" pointer needed since the Index and Data registers
+             * are each field definitions unto themselves.
+             */
+        union acpi_operand_object *index_obj;   /* Index register */
+        union acpi_operand_object *data_obj;    /* Data register */
+};
+
+/* The buffer_field is different in that it is part of a Buffer, not an op_region */
+
+struct acpi_object_buffer_field {
+        ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *buffer_obj; /* Containing Buffer object */
+};
+
+/******************************************************************************
+ *
+ * Objects for handlers
+ *
+ *****************************************************************************/
+
+struct acpi_object_notify_handler {
+        ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *node;     /* Parent device */
+        acpi_notify_handler handler;
+        void *context;
+};
+
+struct acpi_object_addr_handler {
+        ACPI_OBJECT_COMMON_HEADER u8 space_id;
+        u8 handler_flags;
+        acpi_adr_space_handler handler;
+        struct acpi_namespace_node *node;       /* Parent device */
+        void *context;
+        acpi_adr_space_setup setup;
+        union acpi_operand_object *region_list; /* regions using this handler */
+        union acpi_operand_object *next;
+};
+
+/* Flags for address handler (handler_flags) */
+
+#define ACPI_ADDR_HANDLER_DEFAULT_INSTALLED  0x01
+
+/******************************************************************************
+ *
+ * Special internal objects
+ *
+ *****************************************************************************/
+
+/*
+ * The Reference object is used for these opcodes:
+ * Arg[0-6], Local[0-7], index_op, name_op, ref_of_op, load_op, load_table_op, debug_op
+ * The Reference.Class differentiates these types.
+ */
+struct acpi_object_reference {
+        ACPI_OBJECT_COMMON_HEADER u8 class;     /* Reference Class */
+        u8 target_type;         /* Used for Index Op */
+        u8 reserved;
+        void *object;           /* name_op=>HANDLE to obj, index_op=>union acpi_operand_object */
+        struct acpi_namespace_node *node;       /* ref_of or Namepath */
+        union acpi_operand_object **where;      /* Target of Index */
+        u32 value;              /* Used for Local/Arg/Index/ddb_handle */
+};
+
+/* Values for Reference.Class above */
+
+typedef enum {
+        ACPI_REFCLASS_LOCAL = 0,        /* Method local */
+        ACPI_REFCLASS_ARG = 1,  /* Method argument */
+        ACPI_REFCLASS_REFOF = 2,        /* Result of ref_of() TBD: Split to Ref/Node and Ref/operand_obj? */
+        ACPI_REFCLASS_INDEX = 3,        /* Result of Index() */
+        ACPI_REFCLASS_TABLE = 4,        /* ddb_handle - Load(), load_table() */
+        ACPI_REFCLASS_NAME = 5, /* Reference to a named object */
+        ACPI_REFCLASS_DEBUG = 6,        /* Debug object */
+
+        ACPI_REFCLASS_MAX = 6
+} ACPI_REFERENCE_CLASSES;
+
+/*
+ * Extra object is used as additional storage for types that
+ * have AML code in their declarations (term_args) that must be
+ * evaluated at run time.
+ *
+ * Currently: Region and field_unit types
+ */
+struct acpi_object_extra {
+        ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;       /* _REG method for this region (if any) */
+        void *region_context;   /* Region-specific data */
+        u8 *aml_start;
+        u32 aml_length;
+};
+
+/* Additional data that can be attached to namespace nodes */
+
+struct acpi_object_data {
+        ACPI_OBJECT_COMMON_HEADER acpi_object_handler handler;
+        void *pointer;
+};
+
+/* Structure used when objects are cached for reuse */
+
+struct acpi_object_cache_list {
+        ACPI_OBJECT_COMMON_HEADER union acpi_operand_object *next;      /* Link for object cache and internal lists */
+};
+
+/******************************************************************************
+ *
+ * union acpi_operand_object Descriptor - a giant union of all of the above
+ *
+ *****************************************************************************/
+
+union acpi_operand_object {
+        struct acpi_object_common common;
+        struct acpi_object_integer integer;
+        struct acpi_object_string string;
+        struct acpi_object_buffer buffer;
+        struct acpi_object_package package;
+        struct acpi_object_event event;
+        struct acpi_object_method method;
+        struct acpi_object_mutex mutex;
+        struct acpi_object_region region;
+        struct acpi_object_notify_common common_notify;
+        struct acpi_object_device device;
+        struct acpi_object_power_resource power_resource;
+        struct acpi_object_processor processor;
+        struct acpi_object_thermal_zone thermal_zone;
+        struct acpi_object_field_common common_field;
+        struct acpi_object_region_field field;
+        struct acpi_object_buffer_field buffer_field;
+        struct acpi_object_bank_field bank_field;
+        struct acpi_object_index_field index_field;
+        struct acpi_object_notify_handler notify;
+        struct acpi_object_addr_handler address_space;
+        struct acpi_object_reference reference;
+        struct acpi_object_extra extra;
+        struct acpi_object_data data;
+        struct acpi_object_cache_list cache;
+
+        /*
+         * Add namespace node to union in order to simplify code that accepts both
+         * ACPI_OPERAND_OBJECTs and ACPI_NAMESPACE_NODEs. The structures share
+         * a common descriptor_type field in order to differentiate them.
+         */
+        struct acpi_namespace_node node;
+};
+
+/******************************************************************************
+ *
+ * union acpi_descriptor - objects that share a common descriptor identifier
+ *
+ *****************************************************************************/
+
+/* Object descriptor types */
+
+#define ACPI_DESC_TYPE_CACHED           0x01    /* Used only when object is cached */
+#define ACPI_DESC_TYPE_STATE            0x02
+#define ACPI_DESC_TYPE_STATE_UPDATE     0x03
+#define ACPI_DESC_TYPE_STATE_PACKAGE    0x04
+#define ACPI_DESC_TYPE_STATE_CONTROL    0x05
+#define ACPI_DESC_TYPE_STATE_RPSCOPE    0x06
+#define ACPI_DESC_TYPE_STATE_PSCOPE     0x07
+#define ACPI_DESC_TYPE_STATE_WSCOPE     0x08
+#define ACPI_DESC_TYPE_STATE_RESULT     0x09
+#define ACPI_DESC_TYPE_STATE_NOTIFY     0x0A
+#define ACPI_DESC_TYPE_STATE_THREAD     0x0B
+#define ACPI_DESC_TYPE_WALK             0x0C
+#define ACPI_DESC_TYPE_PARSER           0x0D
+#define ACPI_DESC_TYPE_OPERAND          0x0E
+#define ACPI_DESC_TYPE_NAMED            0x0F
+#define ACPI_DESC_TYPE_MAX              0x0F
+
+struct acpi_common_descriptor {
+        void *common_pointer;
+        u8 descriptor_type;     /* To differentiate various internal objs */
+};
+
+union acpi_descriptor {
+        struct acpi_common_descriptor common;
+        union acpi_operand_object object;
+        struct acpi_namespace_node node;
+        union acpi_parse_object op;
+};
+
+#pragma pack()
+
+#endif                          /* _ACOBJECT_H */
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
new file mode 100644
index 000000000000..dfdf63327885
--- /dev/null
+++ b/drivers/acpi/acpica/acopcode.h
@@ -0,0 +1,323 @@
+/******************************************************************************
+ *
+ * Name: acopcode.h - AML opcode information for the AML parser and interpreter
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACOPCODE_H__
+#define __ACOPCODE_H__
+
+#define MAX_EXTENDED_OPCODE         0x88
+#define NUM_EXTENDED_OPCODE         (MAX_EXTENDED_OPCODE + 1)
+#define MAX_INTERNAL_OPCODE
+#define NUM_INTERNAL_OPCODE         (MAX_INTERNAL_OPCODE + 1)
+
+/* Used for non-assigned opcodes */
+
+#define _UNK                        0x6B
+
+/*
+ * Reserved ASCII characters.  Do not use any of these for
+ * internal opcodes, since they are used to differentiate
+ * name strings from AML opcodes
+ */
+#define _ASC                        0x6C
+#define _NAM                        0x6C
+#define _PFX                        0x6D
+
+/*
+ * All AML opcodes and the parse-time arguments for each.  Used by the AML
+ * parser  Each list is compressed into a 32-bit number and stored in the
+ * master opcode table (in psopcode.c).
+ */
+#define ARGP_ACCESSFIELD_OP             ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_ACQUIRE_OP                 ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_WORDDATA)
+#define ARGP_ADD_OP                     ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_ALIAS_OP                   ARGP_LIST2 (ARGP_NAMESTRING, ARGP_NAME)
+#define ARGP_ARG0                       ARG_NONE
+#define ARGP_ARG1                       ARG_NONE
+#define ARGP_ARG2                       ARG_NONE
+#define ARGP_ARG3                       ARG_NONE
+#define ARGP_ARG4                       ARG_NONE
+#define ARGP_ARG5                       ARG_NONE
+#define ARGP_ARG6                       ARG_NONE
+#define ARGP_BANK_FIELD_OP              ARGP_LIST6 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_NAMESTRING,ARGP_TERMARG,   ARGP_BYTEDATA,  ARGP_FIELDLIST)
+#define ARGP_BIT_AND_OP                 ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_BIT_NAND_OP                ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_BIT_NOR_OP                 ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_BIT_NOT_OP                 ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_BIT_OR_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_BIT_XOR_OP                 ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_BREAK_OP                   ARG_NONE
+#define ARGP_BREAK_POINT_OP             ARG_NONE
+#define ARGP_BUFFER_OP                  ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_BYTELIST)
+#define ARGP_BYTE_OP                    ARGP_LIST1 (ARGP_BYTEDATA)
+#define ARGP_BYTELIST_OP                ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_SUPERNAME)
+#define ARGP_CONTINUE_OP                ARG_NONE
+#define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)
+#define ARGP_CREATE_BIT_FIELD_OP        ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
+#define ARGP_CREATE_BYTE_FIELD_OP       ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
+#define ARGP_CREATE_DWORD_FIELD_OP      ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
+#define ARGP_CREATE_FIELD_OP            ARGP_LIST4 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TERMARG,   ARGP_NAME)
+#define ARGP_CREATE_QWORD_FIELD_OP      ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
+#define ARGP_CREATE_WORD_FIELD_OP       ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)
+#define ARGP_DATA_REGION_OP             ARGP_LIST4 (ARGP_NAME,       ARGP_TERMARG,       ARGP_TERMARG,   ARGP_TERMARG)
+#define ARGP_DEBUG_OP                   ARG_NONE
+#define ARGP_DECREMENT_OP               ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_DEREF_OF_OP                ARGP_LIST1 (ARGP_TERMARG)
+#define ARGP_DEVICE_OP                  ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_OBJLIST)
+#define ARGP_DIVIDE_OP                  ARGP_LIST4 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET,    ARGP_TARGET)
+#define ARGP_DWORD_OP                   ARGP_LIST1 (ARGP_DWORDDATA)
+#define ARGP_ELSE_OP                    ARGP_LIST2 (ARGP_PKGLENGTH,  ARGP_TERMLIST)
+#define ARGP_EVENT_OP                   ARGP_LIST1 (ARGP_NAME)
+#define ARGP_FATAL_OP                   ARGP_LIST3 (ARGP_BYTEDATA,   ARGP_DWORDDATA,     ARGP_TERMARG)
+#define ARGP_FIELD_OP                   ARGP_LIST4 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_BYTEDATA,  ARGP_FIELDLIST)
+#define ARGP_FIND_SET_LEFT_BIT_OP       ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_FIND_SET_RIGHT_BIT_OP      ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_FROM_BCD_OP                ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_IF_OP                      ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_TERMLIST)
+#define ARGP_INCREMENT_OP               ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_INDEX_FIELD_OP             ARGP_LIST5 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_NAMESTRING,ARGP_BYTEDATA,  ARGP_FIELDLIST)
+#define ARGP_INDEX_OP                   ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_LAND_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LEQUAL_OP                  ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LGREATER_OP                ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LGREATEREQUAL_OP           ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LLESS_OP                   ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LLESSEQUAL_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LNOT_OP                    ARGP_LIST1 (ARGP_TERMARG)
+#define ARGP_LNOTEQUAL_OP               ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_LOAD_OP                    ARGP_LIST2 (ARGP_NAMESTRING, ARGP_SUPERNAME)
+#define ARGP_LOAD_TABLE_OP              ARGP_LIST6 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TERMARG,   ARGP_TERMARG,  ARGP_TERMARG,   ARGP_TERMARG)
+#define ARGP_LOCAL0                     ARG_NONE
+#define ARGP_LOCAL1                     ARG_NONE
+#define ARGP_LOCAL2                     ARG_NONE
+#define ARGP_LOCAL3                     ARG_NONE
+#define ARGP_LOCAL4                     ARG_NONE
+#define ARGP_LOCAL5                     ARG_NONE
+#define ARGP_LOCAL6                     ARG_NONE
+#define ARGP_LOCAL7                     ARG_NONE
+#define ARGP_LOR_OP                     ARGP_LIST2 (ARGP_TERMARG,    ARGP_TERMARG)
+#define ARGP_MATCH_OP                   ARGP_LIST6 (ARGP_TERMARG,    ARGP_BYTEDATA,      ARGP_TERMARG,   ARGP_BYTEDATA,  ARGP_TERMARG,   ARGP_TERMARG)
+#define ARGP_METHOD_OP                  ARGP_LIST4 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_BYTEDATA,  ARGP_TERMLIST)
+#define ARGP_METHODCALL_OP              ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_MID_OP                     ARGP_LIST4 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TERMARG,   ARGP_TARGET)
+#define ARGP_MOD_OP                     ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_MULTIPLY_OP                ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_MUTEX_OP                   ARGP_LIST2 (ARGP_NAME,       ARGP_BYTEDATA)
+#define ARGP_NAME_OP                    ARGP_LIST2 (ARGP_NAME,       ARGP_DATAOBJ)
+#define ARGP_NAMEDFIELD_OP              ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_NAMEPATH_OP                ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_NOOP_OP                    ARG_NONE
+#define ARGP_NOTIFY_OP                  ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)
+#define ARGP_ONE_OP                     ARG_NONE
+#define ARGP_ONES_OP                    ARG_NONE
+#define ARGP_PACKAGE_OP                 ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_BYTEDATA,      ARGP_DATAOBJLIST)
+#define ARGP_POWER_RES_OP               ARGP_LIST5 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_BYTEDATA,  ARGP_WORDDATA,  ARGP_OBJLIST)
+#define ARGP_PROCESSOR_OP               ARGP_LIST6 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_BYTEDATA,  ARGP_DWORDDATA, ARGP_BYTEDATA,  ARGP_OBJLIST)
+#define ARGP_QWORD_OP                   ARGP_LIST1 (ARGP_QWORDDATA)
+#define ARGP_REF_OF_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_REGION_OP                  ARGP_LIST4 (ARGP_NAME,       ARGP_BYTEDATA,      ARGP_TERMARG,   ARGP_TERMARG)
+#define ARGP_RELEASE_OP                 ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_RESERVEDFIELD_OP           ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_RESET_OP                   ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_RETURN_OP                  ARGP_LIST1 (ARGP_TERMARG)
+#define ARGP_REVISION_OP                ARG_NONE
+#define ARGP_SCOPE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_TERMLIST)
+#define ARGP_SHIFT_LEFT_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_SHIFT_RIGHT_OP             ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_SIGNAL_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_SIZE_OF_OP                 ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_SLEEP_OP                   ARGP_LIST1 (ARGP_TERMARG)
+#define ARGP_STALL_OP                   ARGP_LIST1 (ARGP_TERMARG)
+#define ARGP_STATICSTRING_OP            ARGP_LIST1 (ARGP_NAMESTRING)
+#define ARGP_STORE_OP                   ARGP_LIST2 (ARGP_TERMARG,    ARGP_SUPERNAME)
+#define ARGP_STRING_OP                  ARGP_LIST1 (ARGP_CHARLIST)
+#define ARGP_SUBTRACT_OP                ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_THERMAL_ZONE_OP            ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_OBJLIST)
+#define ARGP_TIMER_OP                   ARG_NONE
+#define ARGP_TO_BCD_OP                  ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_TO_BUFFER_OP               ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_TO_DEC_STR_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_TO_HEX_STR_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_TO_INTEGER_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
+#define ARGP_TO_STRING_OP               ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)
+#define ARGP_TYPE_OP                    ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_UNLOAD_OP                  ARGP_LIST1 (ARGP_SUPERNAME)
+#define ARGP_VAR_PACKAGE_OP             ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_DATAOBJLIST)
+#define ARGP_WAIT_OP                    ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)
+#define ARGP_WHILE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_TERMLIST)
+#define ARGP_WORD_OP                    ARGP_LIST1 (ARGP_WORDDATA)
+#define ARGP_ZERO_OP                    ARG_NONE
+
+/*
+ * All AML opcodes and the runtime arguments for each.  Used by the AML
+ * interpreter  Each list is compressed into a 32-bit number and stored
+ * in the master opcode table (in psopcode.c).
+ *
+ * (Used by prep_operands procedure and the ASL Compiler)
+ */
+#define ARGI_ACCESSFIELD_OP             ARGI_INVALID_OPCODE
+#define ARGI_ACQUIRE_OP                 ARGI_LIST2 (ARGI_MUTEX,      ARGI_INTEGER)
+#define ARGI_ADD_OP                     ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_ALIAS_OP                   ARGI_INVALID_OPCODE
+#define ARGI_ARG0                       ARG_NONE
+#define ARGI_ARG1                       ARG_NONE
+#define ARGI_ARG2                       ARG_NONE
+#define ARGI_ARG3                       ARG_NONE
+#define ARGI_ARG4                       ARG_NONE
+#define ARGI_ARG5                       ARG_NONE
+#define ARGI_ARG6                       ARG_NONE
+#define ARGI_BANK_FIELD_OP              ARGI_INVALID_OPCODE
+#define ARGI_BIT_AND_OP                 ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_BIT_NAND_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_BIT_NOR_OP                 ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_BIT_NOT_OP                 ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)
+#define ARGI_BIT_OR_OP                  ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_BIT_XOR_OP                 ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_BREAK_OP                   ARG_NONE
+#define ARGI_BREAK_POINT_OP             ARG_NONE
+#define ARGI_BUFFER_OP                  ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_BYTE_OP                    ARGI_INVALID_OPCODE
+#define ARGI_BYTELIST_OP                ARGI_INVALID_OPCODE
+#define ARGI_CONCAT_OP                  ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA,   ARGI_TARGETREF)
+#define ARGI_CONCAT_RES_OP              ARGI_LIST3 (ARGI_BUFFER,     ARGI_BUFFER,        ARGI_TARGETREF)
+#define ARGI_COND_REF_OF_OP             ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)
+#define ARGI_CONTINUE_OP                ARGI_INVALID_OPCODE
+#define ARGI_COPY_OP                    ARGI_LIST2 (ARGI_ANYTYPE,    ARGI_SIMPLE_TARGET)
+#define ARGI_CREATE_BIT_FIELD_OP        ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
+#define ARGI_CREATE_BYTE_FIELD_OP       ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
+#define ARGI_CREATE_DWORD_FIELD_OP      ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
+#define ARGI_CREATE_FIELD_OP            ARGI_LIST4 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_INTEGER,      ARGI_REFERENCE)
+#define ARGI_CREATE_QWORD_FIELD_OP      ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
+#define ARGI_CREATE_WORD_FIELD_OP       ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)
+#define ARGI_DATA_REGION_OP             ARGI_LIST3 (ARGI_STRING,     ARGI_STRING,        ARGI_STRING)
+#define ARGI_DEBUG_OP                   ARG_NONE
+#define ARGI_DECREMENT_OP               ARGI_LIST1 (ARGI_TARGETREF)
+#define ARGI_DEREF_OF_OP                ARGI_LIST1 (ARGI_REF_OR_STRING)
+#define ARGI_DEVICE_OP                  ARGI_INVALID_OPCODE
+#define ARGI_DIVIDE_OP                  ARGI_LIST4 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF,    ARGI_TARGETREF)
+#define ARGI_DWORD_OP                   ARGI_INVALID_OPCODE
+#define ARGI_ELSE_OP                    ARGI_INVALID_OPCODE
+#define ARGI_EVENT_OP                   ARGI_INVALID_OPCODE
+#define ARGI_FATAL_OP                   ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_INTEGER)
+#define ARGI_FIELD_OP                   ARGI_INVALID_OPCODE
+#define ARGI_FIND_SET_LEFT_BIT_OP       ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)
+#define ARGI_FIND_SET_RIGHT_BIT_OP      ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)
+#define ARGI_FROM_BCD_OP                ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)
+#define ARGI_IF_OP                      ARGI_INVALID_OPCODE
+#define ARGI_INCREMENT_OP               ARGI_LIST1 (ARGI_TARGETREF)
+#define ARGI_INDEX_FIELD_OP             ARGI_INVALID_OPCODE
+#define ARGI_INDEX_OP                   ARGI_LIST3 (ARGI_COMPLEXOBJ, ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_LAND_OP                    ARGI_LIST2 (ARGI_INTEGER,    ARGI_INTEGER)
+#define ARGI_LEQUAL_OP                  ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA)
+#define ARGI_LGREATER_OP                ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA)
+#define ARGI_LGREATEREQUAL_OP           ARGI_INVALID_OPCODE
+#define ARGI_LLESS_OP                   ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA)
+#define ARGI_LLESSEQUAL_OP              ARGI_INVALID_OPCODE
+#define ARGI_LNOT_OP                    ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_LNOTEQUAL_OP               ARGI_INVALID_OPCODE
+#define ARGI_LOAD_OP                    ARGI_LIST2 (ARGI_REGION_OR_BUFFER,ARGI_TARGETREF)
+#define ARGI_LOAD_TABLE_OP              ARGI_LIST6 (ARGI_STRING,     ARGI_STRING,        ARGI_STRING,       ARGI_STRING,    ARGI_STRING, ARGI_ANYTYPE)
+#define ARGI_LOCAL0                     ARG_NONE
+#define ARGI_LOCAL1                     ARG_NONE
+#define ARGI_LOCAL2                     ARG_NONE
+#define ARGI_LOCAL3                     ARG_NONE
+#define ARGI_LOCAL4                     ARG_NONE
+#define ARGI_LOCAL5                     ARG_NONE
+#define ARGI_LOCAL6                     ARG_NONE
+#define ARGI_LOCAL7                     ARG_NONE
+#define ARGI_LOR_OP                     ARGI_LIST2 (ARGI_INTEGER,    ARGI_INTEGER)
+#define ARGI_MATCH_OP                   ARGI_LIST6 (ARGI_PACKAGE,    ARGI_INTEGER,   ARGI_COMPUTEDATA,      ARGI_INTEGER,ARGI_COMPUTEDATA,ARGI_INTEGER)
+#define ARGI_METHOD_OP                  ARGI_INVALID_OPCODE
+#define ARGI_METHODCALL_OP              ARGI_INVALID_OPCODE
+#define ARGI_MID_OP                     ARGI_LIST4 (ARGI_BUFFER_OR_STRING,ARGI_INTEGER,  ARGI_INTEGER,      ARGI_TARGETREF)
+#define ARGI_MOD_OP                     ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_MULTIPLY_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_MUTEX_OP                   ARGI_INVALID_OPCODE
+#define ARGI_NAME_OP                    ARGI_INVALID_OPCODE
+#define ARGI_NAMEDFIELD_OP              ARGI_INVALID_OPCODE
+#define ARGI_NAMEPATH_OP                ARGI_INVALID_OPCODE
+#define ARGI_NOOP_OP                    ARG_NONE
+#define ARGI_NOTIFY_OP                  ARGI_LIST2 (ARGI_DEVICE_REF, ARGI_INTEGER)
+#define ARGI_ONE_OP                     ARG_NONE
+#define ARGI_ONES_OP                    ARG_NONE
+#define ARGI_PACKAGE_OP                 ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_POWER_RES_OP               ARGI_INVALID_OPCODE
+#define ARGI_PROCESSOR_OP               ARGI_INVALID_OPCODE
+#define ARGI_QWORD_OP                   ARGI_INVALID_OPCODE
+#define ARGI_REF_OF_OP                  ARGI_LIST1 (ARGI_OBJECT_REF)
+#define ARGI_REGION_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_INTEGER)
+#define ARGI_RELEASE_OP                 ARGI_LIST1 (ARGI_MUTEX)
+#define ARGI_RESERVEDFIELD_OP           ARGI_INVALID_OPCODE
+#define ARGI_RESET_OP                   ARGI_LIST1 (ARGI_EVENT)
+#define ARGI_RETURN_OP                  ARGI_INVALID_OPCODE
+#define ARGI_REVISION_OP                ARG_NONE
+#define ARGI_SCOPE_OP                   ARGI_INVALID_OPCODE
+#define ARGI_SHIFT_LEFT_OP              ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_SHIFT_RIGHT_OP             ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_SIGNAL_OP                  ARGI_LIST1 (ARGI_EVENT)
+#define ARGI_SIZE_OF_OP                 ARGI_LIST1 (ARGI_DATAOBJECT)
+#define ARGI_SLEEP_OP                   ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_STALL_OP                   ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_STATICSTRING_OP            ARGI_INVALID_OPCODE
+#define ARGI_STORE_OP                   ARGI_LIST2 (ARGI_DATAREFOBJ, ARGI_TARGETREF)
+#define ARGI_STRING_OP                  ARGI_INVALID_OPCODE
+#define ARGI_SUBTRACT_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
+#define ARGI_THERMAL_ZONE_OP            ARGI_INVALID_OPCODE
+#define ARGI_TIMER_OP                   ARG_NONE
+#define ARGI_TO_BCD_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)
+#define ARGI_TO_BUFFER_OP               ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)
+#define ARGI_TO_DEC_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)
+#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)
+#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)
+#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_FIXED_TARGET)
+#define ARGI_TYPE_OP                    ARGI_LIST1 (ARGI_ANYTYPE)
+#define ARGI_UNLOAD_OP                  ARGI_LIST1 (ARGI_DDBHANDLE)
+#define ARGI_VAR_PACKAGE_OP             ARGI_LIST1 (ARGI_INTEGER)
+#define ARGI_WAIT_OP                    ARGI_LIST2 (ARGI_EVENT,      ARGI_INTEGER)
+#define ARGI_WHILE_OP                   ARGI_INVALID_OPCODE
+#define ARGI_WORD_OP                    ARGI_INVALID_OPCODE
+#define ARGI_ZERO_OP                    ARG_NONE
+
+#endif                          /* __ACOPCODE_H__ */
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
new file mode 100644
index 000000000000..23ee0fbf5619
--- /dev/null
+++ b/drivers/acpi/acpica/acparser.h
@@ -0,0 +1,234 @@
+/******************************************************************************
+ *
+ * Module Name: acparser.h - AML Parser subcomponent prototypes and defines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACPARSER_H__
+#define __ACPARSER_H__
+
+#define OP_HAS_RETURN_VALUE             1
+
+/* Variable number of arguments. This field must be 32 bits */
+
+#define ACPI_VAR_ARGS                   ACPI_UINT32_MAX
+
+#define ACPI_PARSE_DELETE_TREE          0x0001
+#define ACPI_PARSE_NO_TREE_DELETE       0x0000
+#define ACPI_PARSE_TREE_MASK            0x0001
+
+#define ACPI_PARSE_LOAD_PASS1           0x0010
+#define ACPI_PARSE_LOAD_PASS2           0x0020
+#define ACPI_PARSE_EXECUTE              0x0030
+#define ACPI_PARSE_MODE_MASK            0x0030
+
+#define ACPI_PARSE_DEFERRED_OP          0x0100
+#define ACPI_PARSE_DISASSEMBLE          0x0200
+
+/******************************************************************************
+ *
+ * Parser interfaces
+ *
+ *****************************************************************************/
+
+/*
+ * psxface - Parser external interfaces
+ */
+acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info);
+
+/*
+ * psargs - Parse AML opcode arguments
+ */
+u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state);
+
+char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state);
+
+void
+acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
+                            u32 arg_type, union acpi_parse_object *arg);
+
+acpi_status
+acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
+                          struct acpi_parse_state *parser_state,
+                          union acpi_parse_object *arg, u8 method_call);
+
+acpi_status
+acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
+                     struct acpi_parse_state *parser_state,
+                     u32 arg_type, union acpi_parse_object **return_arg);
+
+/*
+ * psfind
+ */
+union acpi_parse_object *acpi_ps_find_name(union acpi_parse_object *scope,
+                                           u32 name, u32 opcode);
+
+union acpi_parse_object *acpi_ps_get_parent(union acpi_parse_object *op);
+
+/*
+ * psopcode - AML Opcode information
+ */
+const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode);
+
+char *acpi_ps_get_opcode_name(u16 opcode);
+
+u8 acpi_ps_get_argument_count(u32 op_type);
+
+/*
+ * psparse - top level parsing routines
+ */
+acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state);
+
+u32 acpi_ps_get_opcode_size(u32 opcode);
+
+u16 acpi_ps_peek_opcode(struct acpi_parse_state *state);
+
+acpi_status
+acpi_ps_complete_this_op(struct acpi_walk_state *walk_state,
+                         union acpi_parse_object *op);
+
+acpi_status
+acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
+                         union acpi_parse_object *op,
+                         acpi_status callback_status);
+
+/*
+ * psloop - main parse loop
+ */
+acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state);
+
+/*
+ * psscope - Scope stack management routines
+ */
+acpi_status
+acpi_ps_init_scope(struct acpi_parse_state *parser_state,
+                   union acpi_parse_object *root);
+
+union acpi_parse_object *acpi_ps_get_parent_scope(struct acpi_parse_state
+                                                  *state);
+
+u8 acpi_ps_has_completed_scope(struct acpi_parse_state *parser_state);
+
+void
+acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
+                  union acpi_parse_object **op,
+                  u32 * arg_list, u32 * arg_count);
+
+acpi_status
+acpi_ps_push_scope(struct acpi_parse_state *parser_state,
+                   union acpi_parse_object *op,
+                   u32 remaining_args, u32 arg_count);
+
+void acpi_ps_cleanup_scope(struct acpi_parse_state *state);
+
+/*
+ * pstree - parse tree manipulation routines
+ */
+void
+acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg);
+
+union acpi_parse_object *acpi_ps_find(union acpi_parse_object *scope,
+                                      char *path, u16 opcode, u32 create);
+
+union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn);
+
+#ifdef  ACPI_FUTURE_USAGE
+union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,
+                                                union acpi_parse_object *op);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+/*
+ * pswalk - parse tree walk routines
+ */
+acpi_status
+acpi_ps_walk_parsed_aml(union acpi_parse_object *start_op,
+                        union acpi_parse_object *end_op,
+                        union acpi_operand_object *mth_desc,
+                        struct acpi_namespace_node *start_node,
+                        union acpi_operand_object **params,
+                        union acpi_operand_object **caller_return_desc,
+                        acpi_owner_id owner_id,
+                        acpi_parse_downwards descending_callback,
+                        acpi_parse_upwards ascending_callback);
+
+acpi_status
+acpi_ps_get_next_walk_op(struct acpi_walk_state *walk_state,
+                         union acpi_parse_object *op,
+                         acpi_parse_upwards ascending_callback);
+
+acpi_status acpi_ps_delete_completed_op(struct acpi_walk_state *walk_state);
+
+void acpi_ps_delete_parse_tree(union acpi_parse_object *root);
+
+/*
+ * psutils - parser utilities
+ */
+union acpi_parse_object *acpi_ps_create_scope_op(void);
+
+void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode);
+
+union acpi_parse_object *acpi_ps_alloc_op(u16 opcode);
+
+void acpi_ps_free_op(union acpi_parse_object *op);
+
+u8 acpi_ps_is_leading_char(u32 c);
+
+u8 acpi_ps_is_prefix_char(u32 c);
+
+#ifdef  ACPI_FUTURE_USAGE
+u32 acpi_ps_get_name(union acpi_parse_object *op);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+void acpi_ps_set_name(union acpi_parse_object *op, u32 name);
+
+/*
+ * psdump - display parser tree
+ */
+u32
+acpi_ps_sprint_path(char *buffer_start,
+                    u32 buffer_size, union acpi_parse_object *op);
+
+u32
+acpi_ps_sprint_op(char *buffer_start,
+                  u32 buffer_size, union acpi_parse_object *op);
+
+void acpi_ps_show(union acpi_parse_object *op);
+
+#endif                          /* __ACPARSER_H__ */
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
new file mode 100644
index 000000000000..16a9ca9a66e4
--- /dev/null
+++ b/drivers/acpi/acpica/acpredef.h
@@ -0,0 +1,371 @@
+/******************************************************************************
+ *
+ * Name: acpredef - Information table for ACPI predefined methods and objects
+ *              $Revision: 1.1 $
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACPREDEF_H__
+#define __ACPREDEF_H__
+
+/******************************************************************************
+ *
+ * Return Package types
+ *
+ * 1) PTYPE1 packages do not contain sub-packages.
+ *
+ * ACPI_PTYPE1_FIXED: Fixed length, 1 or 2 object types:
+ *     object type
+ *     count
+ *     object type
+ *     count
+ *
+ * ACPI_PTYPE1_VAR: Variable length:
+ *    object type (Int/Buf/Ref)
+ *
+ * ACPI_PTYPE1_OPTION: Package has some required and some optional elements:
+ *      Used for _PRW
+ *
+ *
+ * 2) PTYPE2 packages contain a variable number of sub-packages. Each of the
+ *    different types describe the contents of each of the sub-packages.
+ *
+ * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types:
+ *     object type
+ *     count
+ *     object type
+ *     count
+ *
+ * ACPI_PTYPE2_COUNT: Each subpackage has a count as first element:
+ *     object type
+ *
+ * ACPI_PTYPE2_PKG_COUNT: Count of subpackages at start, 1 or 2 object types:
+ *     object type
+ *     count
+ *     object type
+ *     count
+ *
+ * ACPI_PTYPE2_FIXED: Each subpackage is of fixed length:
+ *      Used for _PRT
+ *
+ * ACPI_PTYPE2_MIN: Each subpackage has a variable but minimum length
+ *      Used for _HPX
+ *
+ *****************************************************************************/
+
+enum acpi_return_package_types {
+        ACPI_PTYPE1_FIXED = 1,
+        ACPI_PTYPE1_VAR = 2,
+        ACPI_PTYPE1_OPTION = 3,
+        ACPI_PTYPE2 = 4,
+        ACPI_PTYPE2_COUNT = 5,
+        ACPI_PTYPE2_PKG_COUNT = 6,
+        ACPI_PTYPE2_FIXED = 7,
+        ACPI_PTYPE2_MIN = 8
+};
+
+/*
+ * Predefined method/object information table.
+ *
+ * These are the names that can actually be evaluated via acpi_evaluate_object.
+ * Not present in this table are the following:
+ *
+ *      1) Predefined/Reserved names that are never evaluated via acpi_evaluate_object:
+ *          _Lxx and _Exx GPE methods
+ *          _Qxx EC methods
+ *          _T_x compiler temporary variables
+ *
+ *      2) Predefined names that never actually exist within the AML code:
+ *          Predefined resource descriptor field names
+ *
+ *      3) Predefined names that are implemented within ACPICA:
+ *          _OSI
+ *
+ *      4) Some predefined names that are not documented within the ACPI spec.
+ *          _WDG, _WED
+ *
+ * The main entries in the table each contain the following items:
+ *
+ * Name                 - The ACPI reserved name
+ * param_count          - Number of arguments to the method
+ * expected_btypes      - Allowed type(s) for the return value.
+ *                        0 means that no return value is expected.
+ *
+ * For methods that return packages, the next entry in the table contains
+ * information about the expected structure of the package. This information
+ * is saved here (rather than in a separate table) in order to minimize the
+ * overall size of the stored data.
+ */
+static const union acpi_predefined_info predefined_names[] = {
+        {.info = {"_AC0", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC1", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC2", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC3", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC4", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC5", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC6", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC7", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC8", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AC9", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_ADR", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_AL0", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL1", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL2", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL3", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL4", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL5", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL6", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL7", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL8", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_AL9", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_ALC", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_ALI", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_ALP", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_ALR", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* variable (Pkgs) each 2 (Ints) */
+        {.info = {"_ALT", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_BBN", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_BCL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
+        {.info = {"_BCM", 1, 0}},
+        {.info = {"_BDN", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_BFS", 1, 0}},
+        {.info = {"_BIF", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER,
+                                          9,
+                                          ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER, 4, 0}},        /* fixed (9 Int),(4 Str) */
+        {.info = {"_BLT", 3, 0}},
+        {.info = {"_BMC", 1, 0}},
+        {.info = {"_BMD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},   /* fixed (5 Int) */
+        {.info = {"_BQC", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_BST", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
+        {.info = {"_BTM", 1, ACPI_RTYPE_INTEGER}},
+        {.info = {"_BTP", 1, 0}},
+        {.info = {"_CBA", 0, ACPI_RTYPE_INTEGER}},      /* see PCI firmware spec 3.0 */
+        {.info = {"_CID", 0,
+         ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}},
+        {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0, 0, 0, 0}},    /* variable (Ints/Strs) */
+        {.info = {"_CRS", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_CRT", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_CSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},   /* variable (1 Int(n), n-1 Int) */
+        {.info = {"_CST", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_PKG_COUNT,
+                                          ACPI_RTYPE_BUFFER, 1,
+                                          ACPI_RTYPE_INTEGER, 3, 0}},   /* variable (1 Int(n), n Pkg (1 Buf/3 Int) */
+        {.info = {"_DCK", 1, ACPI_RTYPE_INTEGER}},
+        {.info = {"_DCS", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},
+        {.info = {"_DDN", 0, ACPI_RTYPE_STRING}},
+        {.info = {"_DGS", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_DIS", 0, 0}},
+        {.info = {"_DMA", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_DOD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
+        {.info = {"_DOS", 1, 0}},
+        {.info = {"_DSM", 4, ACPI_RTYPE_ALL}},  /* Must return a type, but it can be of any type */
+        {.info = {"_DSS", 1, 0}},
+        {.info = {"_DSW", 3, 0}},
+        {.info = {"_EC_", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_EDL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_EJ0", 1, 0}},
+        {.info = {"_EJ1", 1, 0}},
+        {.info = {"_EJ2", 1, 0}},
+        {.info = {"_EJ3", 1, 0}},
+        {.info = {"_EJ4", 1, 0}},
+        {.info = {"_EJD", 0, ACPI_RTYPE_STRING}},
+        {.info = {"_FDE", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_FDI", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, 0, 0, 0}},  /* fixed (16 Int) */
+        {.info = {"_FDM", 1, 0}},
+        {.info = {"_FIX", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},     /* variable (Ints) */
+        {.info = {"_GLK", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_GPD", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_GPE", 0, ACPI_RTYPE_INTEGER}},      /* _GPE method, not _GPE scope */
+        {.info = {"_GSB", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_GTF", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_GTM", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_GTS", 1, 0}},
+        {.info = {"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
+        {.info = {"_HOT", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_HPP", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
+
+        /*
+         * For _HPX, a single package is returned, containing a variable number of sub-packages.
+         * Each sub-package contains a PCI record setting. There are several different type of
+         * record settings, of different lengths, but all elements of all settings are Integers.
+         */
+        {.info = {"_HPX", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},     /* variable (Pkgs) each (var Ints) */
+        {.info = {"_IFT", 0, ACPI_RTYPE_INTEGER}},      /* see IPMI spec */
+        {.info = {"_INI", 0, 0}},
+        {.info = {"_IRC", 0, 0}},
+        {.info = {"_LCK", 1, 0}},
+        {.info = {"_LID", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_MAT", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_MLS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_STRING, 2, 0, 0, 0}},  /* variable (Pkgs) each (2 Str) */
+        {.info = {"_MSG", 1, 0}},
+        {.info = {"_OFF", 0, 0}},
+        {.info = {"_ON_", 0, 0}},
+        {.info = {"_OS_", 0, ACPI_RTYPE_STRING}},
+        {.info = {"_OSC", 4, ACPI_RTYPE_BUFFER}},
+        {.info = {"_OST", 3, 0}},
+        {.info = {"_PCL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_PCT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0}},    /* fixed (2 Buf) */
+        {.info = {"_PDC", 1, 0}},
+        {.info = {"_PIC", 1, 0}},
+        {.info = {"_PLD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0, 0, 0, 0}},      /* variable (Bufs) */
+        {.info = {"_PPC", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_PPE", 0, ACPI_RTYPE_INTEGER}},      /* see dig64 spec */
+        {.info = {"_PR0", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_PR1", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_PR2", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_PRS", 0, ACPI_RTYPE_BUFFER}},
+
+        /*
+         * For _PRT, many BIOSs reverse the 2nd and 3rd Package elements. This bug is so prevalent that there
+         * is code in the ACPICA Resource Manager to detect this and switch them back. For now, do not allow
+         * and issue a warning. To allow this and eliminate the warning, add the ACPI_RTYPE_REFERENCE
+         * type to the 2nd element (index 1) in the statement below.
+         */
+        {.info = {"_PRT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_FIXED, 4,
+                                          ACPI_RTYPE_INTEGER,
+                                          ACPI_RTYPE_INTEGER,
+                                          ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE, ACPI_RTYPE_INTEGER}},      /* variable (Pkgs) each (4): Int,Int,Int/Ref,Int */
+
+        {.info = {"_PRW", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_OPTION, 2,
+                                          ACPI_RTYPE_INTEGER |
+                                          ACPI_RTYPE_PACKAGE,
+                                          ACPI_RTYPE_INTEGER, ACPI_RTYPE_REFERENCE, 0}},        /* variable (Pkgs) each: Pkg/Int,Int,[variable Refs] (Pkg is Ref/Int) */
+
+        {.info = {"_PS0", 0, 0}},
+        {.info = {"_PS1", 0, 0}},
+        {.info = {"_PS2", 0, 0}},
+        {.info = {"_PS3", 0, 0}},
+        {.info = {"_PSC", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_PSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0}},   /* variable (Pkgs) each (5 Int) with count */
+        {.info = {"_PSL", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_PSR", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_PSS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6, 0, 0, 0}}, /* variable (Pkgs) each (6 Int) */
+        {.info = {"_PSV", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_PSW", 1, 0}},
+        {.info = {"_PTC", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0}},    /* fixed (2 Buf) */
+        {.info = {"_PTS", 1, 0}},
+        {.info = {"_PXM", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_REG", 2, 0}},
+        {.info = {"_REV", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_RMV", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_ROM", 2, ACPI_RTYPE_BUFFER}},
+        {.info = {"_RTV", 0, ACPI_RTYPE_INTEGER}},
+
+        /*
+         * For _S0_ through _S5_, the ACPI spec defines a return Package containing 1 Integer,
+         * but most DSDTs have it wrong - 2,3, or 4 integers. Allow this by making the objects "variable length",
+         * but all elements must be Integers.
+         */
+        {.info = {"_S0_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+        {.info = {"_S1_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+        {.info = {"_S2_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+        {.info = {"_S3_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+        {.info = {"_S4_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+        {.info = {"_S5_", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0}},     /* fixed (1 Int) */
+
+        {.info = {"_S1D", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S2D", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S3D", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S4D", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S0W", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S1W", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S2W", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S3W", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_S4W", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_SBS", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_SCP", 0x13, 0}},    /* Acpi 1.0 allowed 1 arg. Acpi 3.0 expanded to 3 args. Allow both. */
+        /* Note: the 3-arg definition may be removed for ACPI 4.0 */
+        {.info = {"_SDD", 1, 0}},
+        {.info = {"_SEG", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_SLI", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_SPD", 1, ACPI_RTYPE_INTEGER}},
+        {.info = {"_SRS", 1, 0}},
+        {.info = {"_SRV", 0, ACPI_RTYPE_INTEGER}},      /* see IPMI spec */
+        {.info = {"_SST", 1, 0}},
+        {.info = {"_STA", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_STM", 3, 0}},
+        {.info = {"_STR", 0, ACPI_RTYPE_BUFFER}},
+        {.info = {"_SUN", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_SWS", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TC1", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TC2", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TMP", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TPC", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TPT", 1, 0}},
+        {.info = {"_TRT", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2,
+                                          ACPI_RTYPE_INTEGER, 6, 0}},   /* variable (Pkgs) each 2_ref/6_int */
+        {.info = {"_TSD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}},   /* variable (Pkgs) each 5_int with count */
+        {.info = {"_TSP", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TSS", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}}, /* variable (Pkgs) each 5_int */
+        {.info = {"_TST", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_TTS", 1, 0}},
+        {.info = {"_TZD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0}},   /* variable (Refs) */
+        {.info = {"_TZM", 0, ACPI_RTYPE_REFERENCE}},
+        {.info = {"_TZP", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_UID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},
+        {.info = {"_UPC", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0}},   /* fixed (4 Int) */
+        {.info = {"_UPD", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_UPP", 0, ACPI_RTYPE_INTEGER}},
+        {.info = {"_VPO", 0, ACPI_RTYPE_INTEGER}},
+
+        /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
+
+        {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
+        {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}},      /* fixed (2 Int), but is optional */
+        {.ret_info = {0, 0, 0, 0, 0, 0}}        /* Table terminator */
+};
+
+#if 0
+        /* Not implemented */
+
+{
+"_WDG", 0, ACPI_RTYPE_BUFFER},  /* MS Extension */
+
+{
+"_WED", 1, ACPI_RTYPE_PACKAGE}, /* MS Extension */
+
+    /* This is an internally implemented control method, no need to check */
+{
+"_OSI", 1, ACPI_RTYPE_INTEGER},
+
+    /* TBD: */
+    _PRT - currently ignore reversed entries.attempt to fix here ?
+    think about code that attempts to fix package elements like _BIF, etc.
+#endif
+#endif
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
new file mode 100644
index 000000000000..eef5bd7a59fa
--- /dev/null
+++ b/drivers/acpi/acpica/acresrc.h
@@ -0,0 +1,336 @@
+/******************************************************************************
+ *
+ * Name: acresrc.h - Resource Manager function prototypes
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACRESRC_H__
+#define __ACRESRC_H__
+
+/* Need the AML resource descriptor structs */
+
+#include "amlresrc.h"
+
+/*
+ * If possible, pack the following structures to byte alignment, since we
+ * don't care about performance for debug output. Two cases where we cannot
+ * pack the structures:
+ *
+ * 1) Hardware does not support misaligned memory transfers
+ * 2) Compiler does not support pointers within packed structures
+ */
+#if (!defined(ACPI_MISALIGNMENT_NOT_SUPPORTED) && !defined(ACPI_PACKED_POINTERS_NOT_SUPPORTED))
+#pragma pack(1)
+#endif
+
+/*
+ * Individual entry for the resource conversion tables
+ */
+typedef const struct acpi_rsconvert_info {
+        u8 opcode;
+        u8 resource_offset;
+        u8 aml_offset;
+        u8 value;
+
+} acpi_rsconvert_info;
+
+/* Resource conversion opcodes */
+
+#define ACPI_RSC_INITGET                0
+#define ACPI_RSC_INITSET                1
+#define ACPI_RSC_FLAGINIT               2
+#define ACPI_RSC_1BITFLAG               3
+#define ACPI_RSC_2BITFLAG               4
+#define ACPI_RSC_COUNT                  5
+#define ACPI_RSC_COUNT16                6
+#define ACPI_RSC_LENGTH                 7
+#define ACPI_RSC_MOVE8                  8
+#define ACPI_RSC_MOVE16                 9
+#define ACPI_RSC_MOVE32                 10
+#define ACPI_RSC_MOVE64                 11
+#define ACPI_RSC_SET8                   12
+#define ACPI_RSC_DATA8                  13
+#define ACPI_RSC_ADDRESS                14
+#define ACPI_RSC_SOURCE                 15
+#define ACPI_RSC_SOURCEX                16
+#define ACPI_RSC_BITMASK                17
+#define ACPI_RSC_BITMASK16              18
+#define ACPI_RSC_EXIT_NE                19
+#define ACPI_RSC_EXIT_LE                20
+#define ACPI_RSC_EXIT_EQ                21
+
+/* Resource Conversion sub-opcodes */
+
+#define ACPI_RSC_COMPARE_AML_LENGTH     0
+#define ACPI_RSC_COMPARE_VALUE          1
+
+#define ACPI_RSC_TABLE_SIZE(d)          (sizeof (d) / sizeof (struct acpi_rsconvert_info))
+
+#define ACPI_RS_OFFSET(f)               (u8) ACPI_OFFSET (struct acpi_resource,f)
+#define AML_OFFSET(f)                   (u8) ACPI_OFFSET (union aml_resource,f)
+
+typedef const struct acpi_rsdump_info {
+        u8 opcode;
+        u8 offset;
+        char *name;
+        const char **pointer;
+
+} acpi_rsdump_info;
+
+/* Values for the Opcode field above */
+
+#define ACPI_RSD_TITLE                  0
+#define ACPI_RSD_LITERAL                1
+#define ACPI_RSD_STRING                 2
+#define ACPI_RSD_UINT8                  3
+#define ACPI_RSD_UINT16                 4
+#define ACPI_RSD_UINT32                 5
+#define ACPI_RSD_UINT64                 6
+#define ACPI_RSD_1BITFLAG               7
+#define ACPI_RSD_2BITFLAG               8
+#define ACPI_RSD_SHORTLIST              9
+#define ACPI_RSD_LONGLIST               10
+#define ACPI_RSD_DWORDLIST              11
+#define ACPI_RSD_ADDRESS                12
+#define ACPI_RSD_SOURCE                 13
+
+/* restore default alignment */
+
+#pragma pack()
+
+/* Resource tables indexed by internal resource type */
+
+extern const u8 acpi_gbl_aml_resource_sizes[];
+extern struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[];
+
+/* Resource tables indexed by raw AML resource descriptor type */
+
+extern const u8 acpi_gbl_resource_struct_sizes[];
+extern struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[];
+
+struct acpi_vendor_walk_info {
+        struct acpi_vendor_uuid *uuid;
+        struct acpi_buffer *buffer;
+        acpi_status status;
+};
+
+/*
+ * rscreate
+ */
+acpi_status
+acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
+                             struct acpi_buffer *output_buffer);
+
+acpi_status
+acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
+                             struct acpi_buffer *output_buffer);
+
+acpi_status
+acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
+                                 struct acpi_buffer *output_buffer);
+
+/*
+ * rsutils
+ */
+
+acpi_status
+acpi_rs_get_prt_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer);
+
+acpi_status
+acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer);
+
+acpi_status
+acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer);
+
+acpi_status
+acpi_rs_get_method_data(acpi_handle handle,
+                        char *path, struct acpi_buffer *ret_buffer);
+
+acpi_status
+acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,
+                            struct acpi_buffer *ret_buffer);
+
+/*
+ * rscalc
+ */
+acpi_status
+acpi_rs_get_list_length(u8 * aml_buffer,
+                        u32 aml_buffer_length, acpi_size * size_needed);
+
+acpi_status
+acpi_rs_get_aml_length(struct acpi_resource *linked_list_buffer,
+                       acpi_size * size_needed);
+
+acpi_status
+acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
+                                     acpi_size * buffer_size_needed);
+
+acpi_status
+acpi_rs_convert_aml_to_resources(u8 * aml,
+                                 u32 length,
+                                 u32 offset, u8 resource_index, void **context);
+
+acpi_status
+acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
+                                 acpi_size aml_size_needed, u8 * output_buffer);
+
+/*
+ * rsaddr
+ */
+void
+acpi_rs_set_address_common(union aml_resource *aml,
+                           struct acpi_resource *resource);
+
+u8
+acpi_rs_get_address_common(struct acpi_resource *resource,
+                           union aml_resource *aml);
+
+/*
+ * rsmisc
+ */
+acpi_status
+acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
+                                union aml_resource *aml,
+                                struct acpi_rsconvert_info *info);
+
+acpi_status
+acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
+                                union aml_resource *aml,
+                                struct acpi_rsconvert_info *info);
+
+/*
+ * rsutils
+ */
+void
+acpi_rs_move_data(void *destination,
+                  void *source, u16 item_count, u8 move_type);
+
+u8 acpi_rs_decode_bitmask(u16 mask, u8 * list);
+
+u16 acpi_rs_encode_bitmask(u8 * list, u8 count);
+
+acpi_rs_length
+acpi_rs_get_resource_source(acpi_rs_length resource_length,
+                            acpi_rs_length minimum_length,
+                            struct acpi_resource_source *resource_source,
+                            union aml_resource *aml, char *string_ptr);
+
+acpi_rsdesc_size
+acpi_rs_set_resource_source(union aml_resource *aml,
+                            acpi_rs_length minimum_length,
+                            struct acpi_resource_source *resource_source);
+
+void
+acpi_rs_set_resource_header(u8 descriptor_type,
+                            acpi_rsdesc_size total_length,
+                            union aml_resource *aml);
+
+void
+acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
+                            union aml_resource *aml);
+
+/*
+ * rsdump
+ */
+void acpi_rs_dump_resource_list(struct acpi_resource *resource);
+
+void acpi_rs_dump_irq_list(u8 * route_table);
+
+/*
+ * Resource conversion tables
+ */
+extern struct acpi_rsconvert_info acpi_rs_convert_dma[];
+extern struct acpi_rsconvert_info acpi_rs_convert_end_dpf[];
+extern struct acpi_rsconvert_info acpi_rs_convert_io[];
+extern struct acpi_rsconvert_info acpi_rs_convert_fixed_io[];
+extern struct acpi_rsconvert_info acpi_rs_convert_end_tag[];
+extern struct acpi_rsconvert_info acpi_rs_convert_memory24[];
+extern struct acpi_rsconvert_info acpi_rs_convert_generic_reg[];
+extern struct acpi_rsconvert_info acpi_rs_convert_memory32[];
+extern struct acpi_rsconvert_info acpi_rs_convert_fixed_memory32[];
+extern struct acpi_rsconvert_info acpi_rs_convert_address32[];
+extern struct acpi_rsconvert_info acpi_rs_convert_address16[];
+extern struct acpi_rsconvert_info acpi_rs_convert_ext_irq[];
+extern struct acpi_rsconvert_info acpi_rs_convert_address64[];
+extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[];
+
+/* These resources require separate get/set tables */
+
+extern struct acpi_rsconvert_info acpi_rs_get_irq[];
+extern struct acpi_rsconvert_info acpi_rs_get_start_dpf[];
+extern struct acpi_rsconvert_info acpi_rs_get_vendor_small[];
+extern struct acpi_rsconvert_info acpi_rs_get_vendor_large[];
+
+extern struct acpi_rsconvert_info acpi_rs_set_irq[];
+extern struct acpi_rsconvert_info acpi_rs_set_start_dpf[];
+extern struct acpi_rsconvert_info acpi_rs_set_vendor[];
+
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+/*
+ * rsinfo
+ */
+extern struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[];
+
+/*
+ * rsdump
+ */
+extern struct acpi_rsdump_info acpi_rs_dump_irq[];
+extern struct acpi_rsdump_info acpi_rs_dump_dma[];
+extern struct acpi_rsdump_info acpi_rs_dump_start_dpf[];
+extern struct acpi_rsdump_info acpi_rs_dump_end_dpf[];
+extern struct acpi_rsdump_info acpi_rs_dump_io[];
+extern struct acpi_rsdump_info acpi_rs_dump_fixed_io[];
+extern struct acpi_rsdump_info acpi_rs_dump_vendor[];
+extern struct acpi_rsdump_info acpi_rs_dump_end_tag[];
+extern struct acpi_rsdump_info acpi_rs_dump_memory24[];
+extern struct acpi_rsdump_info acpi_rs_dump_memory32[];
+extern struct acpi_rsdump_info acpi_rs_dump_fixed_memory32[];
+extern struct acpi_rsdump_info acpi_rs_dump_address16[];
+extern struct acpi_rsdump_info acpi_rs_dump_address32[];
+extern struct acpi_rsdump_info acpi_rs_dump_address64[];
+extern struct acpi_rsdump_info acpi_rs_dump_ext_address64[];
+extern struct acpi_rsdump_info acpi_rs_dump_ext_irq[];
+extern struct acpi_rsdump_info acpi_rs_dump_generic_reg[];
+#endif
+
+#endif                          /* __ACRESRC_H__ */
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
new file mode 100644
index 000000000000..7980a26bad35
--- /dev/null
+++ b/drivers/acpi/acpica/acstruct.h
@@ -0,0 +1,228 @@
+/******************************************************************************
+ *
+ * Name: acstruct.h - Internal structs
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACSTRUCT_H__
+#define __ACSTRUCT_H__
+
+/* acpisrc:struct_defs -- for acpisrc conversion */
+
+/*****************************************************************************
+ *
+ * Tree walking typedefs and structs
+ *
+ ****************************************************************************/
+
+/*
+ * Walk state - current state of a parse tree walk.  Used for both a leisurely
+ * stroll through the tree (for whatever reason), and for control method
+ * execution.
+ */
+#define ACPI_NEXT_OP_DOWNWARD       1
+#define ACPI_NEXT_OP_UPWARD         2
+
+/*
+ * Groups of definitions for walk_type used for different implementations of
+ * walkers (never simultaneously) - flags for interpreter:
+ */
+#define ACPI_WALK_NON_METHOD        0
+#define ACPI_WALK_METHOD            0x01
+#define ACPI_WALK_METHOD_RESTART    0x02
+
+/* Flags for i_aSL compiler only */
+
+#define ACPI_WALK_CONST_REQUIRED    0x10
+#define ACPI_WALK_CONST_OPTIONAL    0x20
+
+struct acpi_walk_state {
+        struct acpi_walk_state *next;   /* Next walk_state in list */
+        u8 descriptor_type;     /* To differentiate various internal objs */
+        u8 walk_type;
+        u16 opcode;             /* Current AML opcode */
+        u8 next_op_info;        /* Info about next_op */
+        u8 num_operands;        /* Stack pointer for Operands[] array */
+        u8 operand_index;       /* Index into operand stack, to be used by acpi_ds_obj_stack_push */
+        acpi_owner_id owner_id; /* Owner of objects created during the walk */
+        u8 last_predicate;      /* Result of last predicate */
+        u8 current_result;
+        u8 return_used;
+        u8 scope_depth;
+        u8 pass_number;         /* Parse pass during table load */
+        u8 result_size;         /* Total elements for the result stack */
+        u8 result_count;        /* Current number of occupied elements of result stack */
+        u32 aml_offset;
+        u32 arg_types;
+        u32 method_breakpoint;  /* For single stepping */
+        u32 user_breakpoint;    /* User AML breakpoint */
+        u32 parse_flags;
+
+        struct acpi_parse_state parser_state;   /* Current state of parser */
+        u32 prev_arg_types;
+        u32 arg_count;          /* push for fixed or var args */
+
+        struct acpi_namespace_node arguments[ACPI_METHOD_NUM_ARGS];     /* Control method arguments */
+        struct acpi_namespace_node local_variables[ACPI_METHOD_NUM_LOCALS];     /* Control method locals */
+        union acpi_operand_object *operands[ACPI_OBJ_NUM_OPERANDS + 1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
+        union acpi_operand_object **params;
+
+        u8 *aml_last_while;
+        union acpi_operand_object **caller_return_desc;
+        union acpi_generic_state *control_state;        /* List of control states (nested IFs) */
+        struct acpi_namespace_node *deferred_node;      /* Used when executing deferred opcodes */
+        union acpi_operand_object *implicit_return_obj;
+        struct acpi_namespace_node *method_call_node;   /* Called method Node */
+        union acpi_parse_object *method_call_op;        /* method_call Op if running a method */
+        union acpi_operand_object *method_desc; /* Method descriptor if running a method */
+        struct acpi_namespace_node *method_node;        /* Method node if running a method. */
+        union acpi_parse_object *op;    /* Current parser op */
+        const struct acpi_opcode_info *op_info; /* Info on current opcode */
+        union acpi_parse_object *origin;        /* Start of walk [Obsolete] */
+        union acpi_operand_object *result_obj;
+        union acpi_generic_state *results;      /* Stack of accumulated results */
+        union acpi_operand_object *return_desc; /* Return object, if any */
+        union acpi_generic_state *scope_info;   /* Stack of nested scopes */
+        union acpi_parse_object *prev_op;       /* Last op that was processed */
+        union acpi_parse_object *next_op;       /* next op to be processed */
+        struct acpi_thread_state *thread;
+        acpi_parse_downwards descending_callback;
+        acpi_parse_upwards ascending_callback;
+};
+
+/* Info used by acpi_ps_init_objects */
+
+struct acpi_init_walk_info {
+        u16 method_count;
+        u16 device_count;
+        u16 op_region_count;
+        u16 field_count;
+        u16 buffer_count;
+        u16 package_count;
+        u16 op_region_init;
+        u16 field_init;
+        u16 buffer_init;
+        u16 package_init;
+        u16 object_count;
+        acpi_owner_id owner_id;
+        u32 table_index;
+};
+
+struct acpi_get_devices_info {
+        acpi_walk_callback user_function;
+        void *context;
+        const char *hid;
+};
+
+union acpi_aml_operands {
+        union acpi_operand_object *operands[7];
+
+        struct {
+                struct acpi_object_integer *type;
+                struct acpi_object_integer *code;
+                struct acpi_object_integer *argument;
+
+        } fatal;
+
+        struct {
+                union acpi_operand_object *source;
+                struct acpi_object_integer *index;
+                union acpi_operand_object *target;
+
+        } index;
+
+        struct {
+                union acpi_operand_object *source;
+                struct acpi_object_integer *index;
+                struct acpi_object_integer *length;
+                union acpi_operand_object *target;
+
+        } mid;
+};
+
+/*
+ * Structure used to pass object evaluation parameters.
+ * Purpose is to reduce CPU stack use.
+ */
+struct acpi_evaluate_info {
+        struct acpi_namespace_node *prefix_node;
+        char *pathname;
+        union acpi_operand_object *obj_desc;
+        union acpi_operand_object **parameters;
+        struct acpi_namespace_node *resolved_node;
+        union acpi_operand_object *return_object;
+        u8 param_count;
+        u8 pass_number;
+        u8 return_object_type;
+        u8 flags;
+};
+
+/* Values for Flags above */
+
+#define ACPI_IGNORE_RETURN_VALUE        1
+
+/* Info used by acpi_ns_initialize_devices */
+
+struct acpi_device_walk_info {
+        u16 device_count;
+        u16 num_STA;
+        u16 num_INI;
+        struct acpi_table_desc *table_desc;
+        struct acpi_evaluate_info *evaluate_info;
+};
+
+/* TBD: [Restructure] Merge with struct above */
+
+struct acpi_walk_info {
+        u32 debug_level;
+        u32 count;
+        acpi_owner_id owner_id;
+        u8 display_type;
+};
+
+/* Display Types */
+
+#define ACPI_DISPLAY_SUMMARY        (u8) 0
+#define ACPI_DISPLAY_OBJECTS        (u8) 1
+#define ACPI_DISPLAY_MASK           (u8) 1
+
+#define ACPI_DISPLAY_SHORT          (u8) 2
+
+#endif
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
new file mode 100644
index 000000000000..7ce6e33c7f78
--- /dev/null
+++ b/drivers/acpi/acpica/actables.h
@@ -0,0 +1,117 @@
+/******************************************************************************
+ *
+ * Name: actables.h - ACPI table management
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACTABLES_H__
+#define __ACTABLES_H__
+
+acpi_status acpi_allocate_root_table(u32 initial_table_count);
+
+/*
+ * tbfadt - FADT parse/convert/validate
+ */
+void acpi_tb_parse_fadt(u32 table_index, u8 flags);
+
+void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length);
+
+/*
+ * tbfind - find ACPI table
+ */
+acpi_status
+acpi_tb_find_table(char *signature,
+                   char *oem_id, char *oem_table_id, u32 *table_index);
+
+/*
+ * tbinstal - Table removal and deletion
+ */
+acpi_status acpi_tb_resize_root_table_list(void);
+
+acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc);
+
+acpi_status
+acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index);
+
+acpi_status
+acpi_tb_store_table(acpi_physical_address address,
+                    struct acpi_table_header *table,
+                    u32 length, u8 flags, u32 *table_index);
+
+void acpi_tb_delete_table(struct acpi_table_desc *table_desc);
+
+void acpi_tb_terminate(void);
+
+void acpi_tb_delete_namespace_by_owner(u32 table_index);
+
+acpi_status acpi_tb_allocate_owner_id(u32 table_index);
+
+acpi_status acpi_tb_release_owner_id(u32 table_index);
+
+acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id);
+
+u8 acpi_tb_is_table_loaded(u32 table_index);
+
+void acpi_tb_set_table_loaded_flag(u32 table_index, u8 is_loaded);
+
+/*
+ * tbutils - table manager utilities
+ */
+acpi_status acpi_tb_initialize_facs(void);
+
+u8 acpi_tb_tables_loaded(void);
+
+void
+acpi_tb_print_table_header(acpi_physical_address address,
+                           struct acpi_table_header *header);
+
+u8 acpi_tb_checksum(u8 *buffer, u32 length);
+
+acpi_status
+acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length);
+
+void
+acpi_tb_install_table(acpi_physical_address address,
+                      u8 flags, char *signature, u32 table_index);
+
+acpi_status
+acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags);
+
+#endif                          /* __ACTABLES_H__ */
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
new file mode 100644
index 000000000000..80d8813484fe
--- /dev/null
+++ b/drivers/acpi/acpica/acutils.h
@@ -0,0 +1,549 @@
+/******************************************************************************
+ *
+ * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACUTILS_H
+#define _ACUTILS_H
+
+extern const u8 acpi_gbl_resource_aml_sizes[];
+
+/* Strings used by the disassembler and debugger resource dump routines */
+
+#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
+
+extern const char *acpi_gbl_bm_decode[];
+extern const char *acpi_gbl_config_decode[];
+extern const char *acpi_gbl_consume_decode[];
+extern const char *acpi_gbl_dec_decode[];
+extern const char *acpi_gbl_he_decode[];
+extern const char *acpi_gbl_io_decode[];
+extern const char *acpi_gbl_ll_decode[];
+extern const char *acpi_gbl_max_decode[];
+extern const char *acpi_gbl_mem_decode[];
+extern const char *acpi_gbl_min_decode[];
+extern const char *acpi_gbl_mtp_decode[];
+extern const char *acpi_gbl_rng_decode[];
+extern const char *acpi_gbl_rw_decode[];
+extern const char *acpi_gbl_shr_decode[];
+extern const char *acpi_gbl_siz_decode[];
+extern const char *acpi_gbl_trs_decode[];
+extern const char *acpi_gbl_ttp_decode[];
+extern const char *acpi_gbl_typ_decode[];
+#endif
+
+/* Types for Resource descriptor entries */
+
+#define ACPI_INVALID_RESOURCE           0
+#define ACPI_FIXED_LENGTH               1
+#define ACPI_VARIABLE_LENGTH            2
+#define ACPI_SMALL_VARIABLE_LENGTH      3
+
+typedef
+acpi_status(*acpi_walk_aml_callback) (u8 * aml,
+                                      u32 length,
+                                      u32 offset,
+                                      u8 resource_index, void **context);
+
+typedef
+acpi_status(*acpi_pkg_callback) (u8 object_type,
+                                 union acpi_operand_object * source_object,
+                                 union acpi_generic_state * state,
+                                 void *context);
+
+struct acpi_pkg_info {
+        u8 *free_space;
+        acpi_size length;
+        u32 object_space;
+        u32 num_packages;
+};
+
+#define REF_INCREMENT       (u16) 0
+#define REF_DECREMENT       (u16) 1
+#define REF_FORCE_DELETE    (u16) 2
+
+/* acpi_ut_dump_buffer */
+
+#define DB_BYTE_DISPLAY     1
+#define DB_WORD_DISPLAY     2
+#define DB_DWORD_DISPLAY    4
+#define DB_QWORD_DISPLAY    8
+
+/*
+ * utglobal - Global data structures and procedures
+ */
+acpi_status acpi_ut_init_globals(void);
+
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+
+char *acpi_ut_get_mutex_name(u32 mutex_id);
+
+const char *acpi_ut_get_notify_name(u32 notify_value);
+
+#endif
+
+char *acpi_ut_get_type_name(acpi_object_type type);
+
+char *acpi_ut_get_node_name(void *object);
+
+char *acpi_ut_get_descriptor_name(void *object);
+
+const char *acpi_ut_get_reference_name(union acpi_operand_object *object);
+
+char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc);
+
+char *acpi_ut_get_region_name(u8 space_id);
+
+char *acpi_ut_get_event_name(u32 event_id);
+
+char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position);
+
+u8 acpi_ut_valid_object_type(acpi_object_type type);
+
+/*
+ * utinit - miscellaneous initialization and shutdown
+ */
+acpi_status acpi_ut_hardware_initialize(void);
+
+void acpi_ut_subsystem_shutdown(void);
+
+/*
+ * utclib - Local implementations of C library functions
+ */
+#ifndef ACPI_USE_SYSTEM_CLIBRARY
+
+acpi_size acpi_ut_strlen(const char *string);
+
+char *acpi_ut_strcpy(char *dst_string, const char *src_string);
+
+char *acpi_ut_strncpy(char *dst_string,
+                      const char *src_string, acpi_size count);
+
+int acpi_ut_memcmp(const char *buffer1, const char *buffer2, acpi_size count);
+
+int acpi_ut_strncmp(const char *string1, const char *string2, acpi_size count);
+
+int acpi_ut_strcmp(const char *string1, const char *string2);
+
+char *acpi_ut_strcat(char *dst_string, const char *src_string);
+
+char *acpi_ut_strncat(char *dst_string,
+                      const char *src_string, acpi_size count);
+
+u32 acpi_ut_strtoul(const char *string, char **terminator, u32 base);
+
+char *acpi_ut_strstr(char *string1, char *string2);
+
+void *acpi_ut_memcpy(void *dest, const void *src, acpi_size count);
+
+void *acpi_ut_memset(void *dest, u8 value, acpi_size count);
+
+int acpi_ut_to_upper(int c);
+
+int acpi_ut_to_lower(int c);
+
+extern const u8 _acpi_ctype[];
+
+#define _ACPI_XA     0x00       /* extra alphabetic - not supported */
+#define _ACPI_XS     0x40       /* extra space */
+#define _ACPI_BB     0x00       /* BEL, BS, etc. - not supported */
+#define _ACPI_CN     0x20       /* CR, FF, HT, NL, VT */
+#define _ACPI_DI     0x04       /* '0'-'9' */
+#define _ACPI_LO     0x02       /* 'a'-'z' */
+#define _ACPI_PU     0x10       /* punctuation */
+#define _ACPI_SP     0x08       /* space */
+#define _ACPI_UP     0x01       /* 'A'-'Z' */
+#define _ACPI_XD     0x80       /* '0'-'9', 'A'-'F', 'a'-'f' */
+
+#define ACPI_IS_DIGIT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI))
+#define ACPI_IS_SPACE(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP))
+#define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD))
+#define ACPI_IS_UPPER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
+#define ACPI_IS_LOWER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
+#define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU))
+#define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
+
+#endif                          /* ACPI_USE_SYSTEM_CLIBRARY */
+
+/*
+ * utcopy - Object construction and conversion interfaces
+ */
+acpi_status
+acpi_ut_build_simple_object(union acpi_operand_object *obj,
+                            union acpi_object *user_obj,
+                            u8 * data_space, u32 * buffer_space_used);
+
+acpi_status
+acpi_ut_build_package_object(union acpi_operand_object *obj,
+                             u8 * buffer, u32 * space_used);
+
+acpi_status
+acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *obj,
+                                struct acpi_buffer *ret_buffer);
+
+acpi_status
+acpi_ut_copy_eobject_to_iobject(union acpi_object *obj,
+                                union acpi_operand_object **internal_obj);
+
+acpi_status
+acpi_ut_copy_isimple_to_isimple(union acpi_operand_object *source_obj,
+                                union acpi_operand_object *dest_obj);
+
+acpi_status
+acpi_ut_copy_iobject_to_iobject(union acpi_operand_object *source_desc,
+                                union acpi_operand_object **dest_desc,
+                                struct acpi_walk_state *walk_state);
+
+/*
+ * utcreate - Object creation
+ */
+acpi_status
+acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action);
+
+/*
+ * utdebug - Debug interfaces
+ */
+void acpi_ut_init_stack_ptr_trace(void);
+
+void acpi_ut_track_stack_ptr(void);
+
+void
+acpi_ut_trace(u32 line_number,
+              const char *function_name,
+              const char *module_name, u32 component_id);
+
+void
+acpi_ut_trace_ptr(u32 line_number,
+                  const char *function_name,
+                  const char *module_name, u32 component_id, void *pointer);
+
+void
+acpi_ut_trace_u32(u32 line_number,
+                  const char *function_name,
+                  const char *module_name, u32 component_id, u32 integer);
+
+void
+acpi_ut_trace_str(u32 line_number,
+                  const char *function_name,
+                  const char *module_name, u32 component_id, char *string);
+
+void
+acpi_ut_exit(u32 line_number,
+             const char *function_name,
+             const char *module_name, u32 component_id);
+
+void
+acpi_ut_status_exit(u32 line_number,
+                    const char *function_name,
+                    const char *module_name,
+                    u32 component_id, acpi_status status);
+
+void
+acpi_ut_value_exit(u32 line_number,
+                   const char *function_name,
+                   const char *module_name,
+                   u32 component_id, acpi_integer value);
+
+void
+acpi_ut_ptr_exit(u32 line_number,
+                 const char *function_name,
+                 const char *module_name, u32 component_id, u8 *ptr);
+
+void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id);
+
+void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display);
+
+void acpi_ut_report_error(char *module_name, u32 line_number);
+
+void acpi_ut_report_info(char *module_name, u32 line_number);
+
+void acpi_ut_report_warning(char *module_name, u32 line_number);
+
+/*
+ * utdelete - Object deletion and reference counts
+ */
+void acpi_ut_add_reference(union acpi_operand_object *object);
+
+void acpi_ut_remove_reference(union acpi_operand_object *object);
+
+void acpi_ut_delete_internal_package_object(union acpi_operand_object *object);
+
+void acpi_ut_delete_internal_simple_object(union acpi_operand_object *object);
+
+void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list);
+
+/*
+ * uteval - object evaluation
+ */
+acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state);
+
+acpi_status
+acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
+                        char *path,
+                        u32 expected_return_btypes,
+                        union acpi_operand_object **return_desc);
+
+acpi_status
+acpi_ut_evaluate_numeric_object(char *object_name,
+                                struct acpi_namespace_node *device_node,
+                                acpi_integer * address);
+
+acpi_status
+acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
+                    struct acpica_device_id *hid);
+
+acpi_status
+acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
+                    struct acpi_compatible_id_list **return_cid_list);
+
+acpi_status
+acpi_ut_execute_STA(struct acpi_namespace_node *device_node,
+                    u32 * status_flags);
+
+acpi_status
+acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
+                    struct acpica_device_id *uid);
+
+acpi_status
+acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest);
+
+/*
+ * utobject - internal object create/delete/cache routines
+ */
+union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char
+                                                              *module_name,
+                                                              u32 line_number,
+                                                              u32 component_id,
+                                                              acpi_object_type
+                                                              type);
+
+void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
+                                       u32 line_number, u32 component_id);
+
+#define acpi_ut_create_internal_object(t) acpi_ut_create_internal_object_dbg (_acpi_module_name,__LINE__,_COMPONENT,t)
+#define acpi_ut_allocate_object_desc()  acpi_ut_allocate_object_desc_dbg (_acpi_module_name,__LINE__,_COMPONENT)
+
+void acpi_ut_delete_object_desc(union acpi_operand_object *object);
+
+u8 acpi_ut_valid_internal_object(void *object);
+
+union acpi_operand_object *acpi_ut_create_package_object(u32 count);
+
+union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size);
+
+union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size);
+
+acpi_status
+acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size * obj_length);
+
+/*
+ * utstate - Generic state creation/cache routines
+ */
+void
+acpi_ut_push_generic_state(union acpi_generic_state **list_head,
+                           union acpi_generic_state *state);
+
+union acpi_generic_state *acpi_ut_pop_generic_state(union acpi_generic_state
+                                                    **list_head);
+
+union acpi_generic_state *acpi_ut_create_generic_state(void);
+
+struct acpi_thread_state *acpi_ut_create_thread_state(void);
+
+union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object
+                                                      *object, u16 action);
+
+union acpi_generic_state *acpi_ut_create_pkg_state(void *internal_object,
+                                                   void *external_object,
+                                                   u16 index);
+
+acpi_status
+acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
+                                     u16 action,
+                                     union acpi_generic_state **state_list);
+
+#ifdef  ACPI_FUTURE_USAGE
+acpi_status
+acpi_ut_create_pkg_state_and_push(void *internal_object,
+                                  void *external_object,
+                                  u16 index,
+                                  union acpi_generic_state **state_list);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+union acpi_generic_state *acpi_ut_create_control_state(void);
+
+void acpi_ut_delete_generic_state(union acpi_generic_state *state);
+
+/*
+ * utmath
+ */
+acpi_status
+acpi_ut_divide(acpi_integer in_dividend,
+               acpi_integer in_divisor,
+               acpi_integer * out_quotient, acpi_integer * out_remainder);
+
+acpi_status
+acpi_ut_short_divide(acpi_integer in_dividend,
+                     u32 divisor,
+                     acpi_integer * out_quotient, u32 * out_remainder);
+
+/*
+ * utmisc
+ */
+const char *acpi_ut_validate_exception(acpi_status status);
+
+u8 acpi_ut_is_aml_table(struct acpi_table_header *table);
+
+acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id);
+
+void acpi_ut_release_owner_id(acpi_owner_id * owner_id);
+
+acpi_status
+acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
+                          void *target_object,
+                          acpi_pkg_callback walk_callback, void *context);
+
+void acpi_ut_strupr(char *src_string);
+
+void acpi_ut_print_string(char *string, u8 max_length);
+
+u8 acpi_ut_valid_acpi_name(u32 name);
+
+acpi_name acpi_ut_repair_name(char *name);
+
+u8 acpi_ut_valid_acpi_char(char character, u32 position);
+
+acpi_status
+acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer);
+
+/* Values for Base above (16=Hex, 10=Decimal) */
+
+#define ACPI_ANY_BASE        0
+
+u32 acpi_ut_dword_byte_swap(u32 value);
+
+void acpi_ut_set_integer_width(u8 revision);
+
+#ifdef ACPI_DEBUG_OUTPUT
+void
+acpi_ut_display_init_pathname(u8 type,
+                              struct acpi_namespace_node *obj_handle,
+                              char *path);
+#endif
+
+/*
+ * utresrc
+ */
+acpi_status
+acpi_ut_walk_aml_resources(u8 * aml,
+                           acpi_size aml_length,
+                           acpi_walk_aml_callback user_function,
+                           void **context);
+
+acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);
+
+u32 acpi_ut_get_descriptor_length(void *aml);
+
+u16 acpi_ut_get_resource_length(void *aml);
+
+u8 acpi_ut_get_resource_header_length(void *aml);
+
+u8 acpi_ut_get_resource_type(void *aml);
+
+acpi_status
+acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc,
+                             u8 ** end_tag);
+
+/*
+ * utmutex - mutex support
+ */
+acpi_status acpi_ut_mutex_initialize(void);
+
+void acpi_ut_mutex_terminate(void);
+
+acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id);
+
+acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id);
+
+/*
+ * utalloc - memory allocation and object caching
+ */
+acpi_status acpi_ut_create_caches(void);
+
+acpi_status acpi_ut_delete_caches(void);
+
+acpi_status acpi_ut_validate_buffer(struct acpi_buffer *buffer);
+
+acpi_status
+acpi_ut_initialize_buffer(struct acpi_buffer *buffer,
+                          acpi_size required_length);
+
+void *acpi_ut_allocate(acpi_size size,
+                       u32 component, const char *module, u32 line);
+
+void *acpi_ut_allocate_zeroed(acpi_size size,
+                              u32 component, const char *module, u32 line);
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+void *acpi_ut_allocate_and_track(acpi_size size,
+                                 u32 component, const char *module, u32 line);
+
+void *acpi_ut_allocate_zeroed_and_track(acpi_size size,
+                                        u32 component,
+                                        const char *module, u32 line);
+
+void
+acpi_ut_free_and_track(void *address,
+                       u32 component, const char *module, u32 line);
+
+#ifdef  ACPI_FUTURE_USAGE
+void acpi_ut_dump_allocation_info(void);
+#endif                          /* ACPI_FUTURE_USAGE */
+
+void acpi_ut_dump_allocations(u32 component, const char *module);
+
+acpi_status
+acpi_ut_create_list(char *list_name,
+                    u16 object_size, struct acpi_memory_list **return_cache);
+
+#endif
+
+#endif                          /* _ACUTILS_H */
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
new file mode 100644
index 000000000000..ff851c5df698
--- /dev/null
+++ b/drivers/acpi/acpica/amlcode.h
@@ -0,0 +1,494 @@
+/******************************************************************************
+ *
+ * Name: amlcode.h - Definitions for AML, as included in "definition blocks"
+ *                   Declarations and definitions contained herein are derived
+ *                   directly from the ACPI specification.
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __AMLCODE_H__
+#define __AMLCODE_H__
+
+/* primary opcodes */
+
+#define AML_NULL_CHAR               (u16) 0x00
+
+#define AML_ZERO_OP                 (u16) 0x00
+#define AML_ONE_OP                  (u16) 0x01
+#define AML_UNASSIGNED              (u16) 0x02
+#define AML_ALIAS_OP                (u16) 0x06
+#define AML_NAME_OP                 (u16) 0x08
+#define AML_BYTE_OP                 (u16) 0x0a
+#define AML_WORD_OP                 (u16) 0x0b
+#define AML_DWORD_OP                (u16) 0x0c
+#define AML_STRING_OP               (u16) 0x0d
+#define AML_QWORD_OP                (u16) 0x0e  /* ACPI 2.0 */
+#define AML_SCOPE_OP                (u16) 0x10
+#define AML_BUFFER_OP               (u16) 0x11
+#define AML_PACKAGE_OP              (u16) 0x12
+#define AML_VAR_PACKAGE_OP          (u16) 0x13  /* ACPI 2.0 */
+#define AML_METHOD_OP               (u16) 0x14
+#define AML_DUAL_NAME_PREFIX        (u16) 0x2e
+#define AML_MULTI_NAME_PREFIX_OP    (u16) 0x2f
+#define AML_NAME_CHAR_SUBSEQ        (u16) 0x30
+#define AML_NAME_CHAR_FIRST         (u16) 0x41
+#define AML_EXTENDED_OP_PREFIX      (u16) 0x5b
+#define AML_ROOT_PREFIX             (u16) 0x5c
+#define AML_PARENT_PREFIX           (u16) 0x5e
+#define AML_LOCAL_OP                (u16) 0x60
+#define AML_LOCAL0                  (u16) 0x60
+#define AML_LOCAL1                  (u16) 0x61
+#define AML_LOCAL2                  (u16) 0x62
+#define AML_LOCAL3                  (u16) 0x63
+#define AML_LOCAL4                  (u16) 0x64
+#define AML_LOCAL5                  (u16) 0x65
+#define AML_LOCAL6                  (u16) 0x66
+#define AML_LOCAL7                  (u16) 0x67
+#define AML_ARG_OP                  (u16) 0x68
+#define AML_ARG0                    (u16) 0x68
+#define AML_ARG1                    (u16) 0x69
+#define AML_ARG2                    (u16) 0x6a
+#define AML_ARG3                    (u16) 0x6b
+#define AML_ARG4                    (u16) 0x6c
+#define AML_ARG5                    (u16) 0x6d
+#define AML_ARG6                    (u16) 0x6e
+#define AML_STORE_OP                (u16) 0x70
+#define AML_REF_OF_OP               (u16) 0x71
+#define AML_ADD_OP                  (u16) 0x72
+#define AML_CONCAT_OP               (u16) 0x73
+#define AML_SUBTRACT_OP             (u16) 0x74
+#define AML_INCREMENT_OP            (u16) 0x75
+#define AML_DECREMENT_OP            (u16) 0x76
+#define AML_MULTIPLY_OP             (u16) 0x77
+#define AML_DIVIDE_OP               (u16) 0x78
+#define AML_SHIFT_LEFT_OP           (u16) 0x79
+#define AML_SHIFT_RIGHT_OP          (u16) 0x7a
+#define AML_BIT_AND_OP              (u16) 0x7b
+#define AML_BIT_NAND_OP             (u16) 0x7c
+#define AML_BIT_OR_OP               (u16) 0x7d
+#define AML_BIT_NOR_OP              (u16) 0x7e
+#define AML_BIT_XOR_OP              (u16) 0x7f
+#define AML_BIT_NOT_OP              (u16) 0x80
+#define AML_FIND_SET_LEFT_BIT_OP    (u16) 0x81
+#define AML_FIND_SET_RIGHT_BIT_OP   (u16) 0x82
+#define AML_DEREF_OF_OP             (u16) 0x83
+#define AML_CONCAT_RES_OP           (u16) 0x84  /* ACPI 2.0 */
+#define AML_MOD_OP                  (u16) 0x85  /* ACPI 2.0 */
+#define AML_NOTIFY_OP               (u16) 0x86
+#define AML_SIZE_OF_OP              (u16) 0x87
+#define AML_INDEX_OP                (u16) 0x88
+#define AML_MATCH_OP                (u16) 0x89
+#define AML_CREATE_DWORD_FIELD_OP   (u16) 0x8a
+#define AML_CREATE_WORD_FIELD_OP    (u16) 0x8b
+#define AML_CREATE_BYTE_FIELD_OP    (u16) 0x8c
+#define AML_CREATE_BIT_FIELD_OP     (u16) 0x8d
+#define AML_TYPE_OP                 (u16) 0x8e
+#define AML_CREATE_QWORD_FIELD_OP   (u16) 0x8f  /* ACPI 2.0 */
+#define AML_LAND_OP                 (u16) 0x90
+#define AML_LOR_OP                  (u16) 0x91
+#define AML_LNOT_OP                 (u16) 0x92
+#define AML_LEQUAL_OP               (u16) 0x93
+#define AML_LGREATER_OP             (u16) 0x94
+#define AML_LLESS_OP                (u16) 0x95
+#define AML_TO_BUFFER_OP            (u16) 0x96  /* ACPI 2.0 */
+#define AML_TO_DECSTRING_OP         (u16) 0x97  /* ACPI 2.0 */
+#define AML_TO_HEXSTRING_OP         (u16) 0x98  /* ACPI 2.0 */
+#define AML_TO_INTEGER_OP           (u16) 0x99  /* ACPI 2.0 */
+#define AML_TO_STRING_OP            (u16) 0x9c  /* ACPI 2.0 */
+#define AML_COPY_OP                 (u16) 0x9d  /* ACPI 2.0 */
+#define AML_MID_OP                  (u16) 0x9e  /* ACPI 2.0 */
+#define AML_CONTINUE_OP             (u16) 0x9f  /* ACPI 2.0 */
+#define AML_IF_OP                   (u16) 0xa0
+#define AML_ELSE_OP                 (u16) 0xa1
+#define AML_WHILE_OP                (u16) 0xa2
+#define AML_NOOP_OP                 (u16) 0xa3
+#define AML_RETURN_OP               (u16) 0xa4
+#define AML_BREAK_OP                (u16) 0xa5
+#define AML_BREAK_POINT_OP          (u16) 0xcc
+#define AML_ONES_OP                 (u16) 0xff
+
+/* prefixed opcodes */
+
+#define AML_EXTENDED_OPCODE         (u16) 0x5b00        /* prefix for 2-byte opcodes */
+
+#define AML_MUTEX_OP                (u16) 0x5b01
+#define AML_EVENT_OP                (u16) 0x5b02
+#define AML_SHIFT_RIGHT_BIT_OP      (u16) 0x5b10
+#define AML_SHIFT_LEFT_BIT_OP       (u16) 0x5b11
+#define AML_COND_REF_OF_OP          (u16) 0x5b12
+#define AML_CREATE_FIELD_OP         (u16) 0x5b13
+#define AML_LOAD_TABLE_OP           (u16) 0x5b1f        /* ACPI 2.0 */
+#define AML_LOAD_OP                 (u16) 0x5b20
+#define AML_STALL_OP                (u16) 0x5b21
+#define AML_SLEEP_OP                (u16) 0x5b22
+#define AML_ACQUIRE_OP              (u16) 0x5b23
+#define AML_SIGNAL_OP               (u16) 0x5b24
+#define AML_WAIT_OP                 (u16) 0x5b25
+#define AML_RESET_OP                (u16) 0x5b26
+#define AML_RELEASE_OP              (u16) 0x5b27
+#define AML_FROM_BCD_OP             (u16) 0x5b28
+#define AML_TO_BCD_OP               (u16) 0x5b29
+#define AML_UNLOAD_OP               (u16) 0x5b2a
+#define AML_REVISION_OP             (u16) 0x5b30
+#define AML_DEBUG_OP                (u16) 0x5b31
+#define AML_FATAL_OP                (u16) 0x5b32
+#define AML_TIMER_OP                (u16) 0x5b33        /* ACPI 3.0 */
+#define AML_REGION_OP               (u16) 0x5b80
+#define AML_FIELD_OP                (u16) 0x5b81
+#define AML_DEVICE_OP               (u16) 0x5b82
+#define AML_PROCESSOR_OP            (u16) 0x5b83
+#define AML_POWER_RES_OP            (u16) 0x5b84
+#define AML_THERMAL_ZONE_OP         (u16) 0x5b85
+#define AML_INDEX_FIELD_OP          (u16) 0x5b86
+#define AML_BANK_FIELD_OP           (u16) 0x5b87
+#define AML_DATA_REGION_OP          (u16) 0x5b88        /* ACPI 2.0 */
+
+/*
+ * Combination opcodes (actually two one-byte opcodes)
+ * Used by the disassembler and i_aSL compiler
+ */
+#define AML_LGREATEREQUAL_OP        (u16) 0x9295
+#define AML_LLESSEQUAL_OP           (u16) 0x9294
+#define AML_LNOTEQUAL_OP            (u16) 0x9293
+
+/*
+ * Internal opcodes
+ * Use only "Unknown" AML opcodes, don't attempt to use
+ * any valid ACPI ASCII values (A-Z, 0-9, '-')
+ */
+#define AML_INT_NAMEPATH_OP         (u16) 0x002d
+#define AML_INT_NAMEDFIELD_OP       (u16) 0x0030
+#define AML_INT_RESERVEDFIELD_OP    (u16) 0x0031
+#define AML_INT_ACCESSFIELD_OP      (u16) 0x0032
+#define AML_INT_BYTELIST_OP         (u16) 0x0033
+#define AML_INT_STATICSTRING_OP     (u16) 0x0034
+#define AML_INT_METHODCALL_OP       (u16) 0x0035
+#define AML_INT_RETURN_VALUE_OP     (u16) 0x0036
+#define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037
+
+#define ARG_NONE                    0x0
+
+/*
+ * Argument types for the AML Parser
+ * Each field in the arg_types u32 is 5 bits, allowing for a maximum of 6 arguments.
+ * There can be up to 31 unique argument types
+ * Zero is reserved as end-of-list indicator
+ */
+#define ARGP_BYTEDATA               0x01
+#define ARGP_BYTELIST               0x02
+#define ARGP_CHARLIST               0x03
+#define ARGP_DATAOBJ                0x04
+#define ARGP_DATAOBJLIST            0x05
+#define ARGP_DWORDDATA              0x06
+#define ARGP_FIELDLIST              0x07
+#define ARGP_NAME                   0x08
+#define ARGP_NAMESTRING             0x09
+#define ARGP_OBJLIST                0x0A
+#define ARGP_PKGLENGTH              0x0B
+#define ARGP_SUPERNAME              0x0C
+#define ARGP_TARGET                 0x0D
+#define ARGP_TERMARG                0x0E
+#define ARGP_TERMLIST               0x0F
+#define ARGP_WORDDATA               0x10
+#define ARGP_QWORDDATA              0x11
+#define ARGP_SIMPLENAME             0x12
+
+/*
+ * Resolved argument types for the AML Interpreter
+ * Each field in the arg_types u32 is 5 bits, allowing for a maximum of 6 arguments.
+ * There can be up to 31 unique argument types (0 is end-of-arg-list indicator)
+ *
+ * Note1: These values are completely independent from the ACPI_TYPEs
+ *        i.e., ARGI_INTEGER != ACPI_TYPE_INTEGER
+ *
+ * Note2: If and when 5 bits becomes insufficient, it would probably be best
+ * to convert to a 6-byte array of argument types, allowing 8 bits per argument.
+ */
+
+/* Single, simple types */
+
+#define ARGI_ANYTYPE                0x01        /* Don't care */
+#define ARGI_PACKAGE                0x02
+#define ARGI_EVENT                  0x03
+#define ARGI_MUTEX                  0x04
+#define ARGI_DDBHANDLE              0x05
+
+/* Interchangeable types (via implicit conversion) */
+
+#define ARGI_INTEGER                0x06
+#define ARGI_STRING                 0x07
+#define ARGI_BUFFER                 0x08
+#define ARGI_BUFFER_OR_STRING       0x09        /* Used by MID op only */
+#define ARGI_COMPUTEDATA            0x0A        /* Buffer, String, or Integer */
+
+/* Reference objects */
+
+#define ARGI_INTEGER_REF            0x0B
+#define ARGI_OBJECT_REF             0x0C
+#define ARGI_DEVICE_REF             0x0D
+#define ARGI_REFERENCE              0x0E
+#define ARGI_TARGETREF              0x0F        /* Target, subject to implicit conversion */
+#define ARGI_FIXED_TARGET           0x10        /* Target, no implicit conversion */
+#define ARGI_SIMPLE_TARGET          0x11        /* Name, Local, Arg -- no implicit conversion */
+
+/* Multiple/complex types */
+
+#define ARGI_DATAOBJECT             0x12        /* Buffer, String, package or reference to a Node - Used only by size_of operator */
+#define ARGI_COMPLEXOBJ             0x13        /* Buffer, String, or package (Used by INDEX op only) */
+#define ARGI_REF_OR_STRING          0x14        /* Reference or String (Used by DEREFOF op only) */
+#define ARGI_REGION_OR_BUFFER       0x15        /* Used by LOAD op only */
+#define ARGI_DATAREFOBJ             0x16
+
+/* Note: types above can expand to 0x1F maximum */
+
+#define ARGI_INVALID_OPCODE         0xFFFFFFFF
+
+/*
+ * hash offsets
+ */
+#define AML_EXTOP_HASH_OFFSET       22
+#define AML_LNOT_HASH_OFFSET        19
+
+/*
+ * opcode groups and types
+ */
+#define OPGRP_NAMED                 0x01
+#define OPGRP_FIELD                 0x02
+#define OPGRP_BYTELIST              0x04
+
+/*
+ * Opcode information
+ */
+
+/* Opcode flags */
+
+#define AML_LOGICAL                 0x0001
+#define AML_LOGICAL_NUMERIC         0x0002
+#define AML_MATH                    0x0004
+#define AML_CREATE                  0x0008
+#define AML_FIELD                   0x0010
+#define AML_DEFER                   0x0020
+#define AML_NAMED                   0x0040
+#define AML_NSNODE                  0x0080
+#define AML_NSOPCODE                0x0100
+#define AML_NSOBJECT                0x0200
+#define AML_HAS_RETVAL              0x0400
+#define AML_HAS_TARGET              0x0800
+#define AML_HAS_ARGS                0x1000
+#define AML_CONSTANT                0x2000
+#define AML_NO_OPERAND_RESOLVE      0x4000
+
+/* Convenient flag groupings */
+
+#define AML_FLAGS_EXEC_0A_0T_1R                                     AML_HAS_RETVAL
+#define AML_FLAGS_EXEC_1A_0T_0R     AML_HAS_ARGS        /* Monadic1  */
+#define AML_FLAGS_EXEC_1A_0T_1R     AML_HAS_ARGS |                  AML_HAS_RETVAL      /* Monadic2  */
+#define AML_FLAGS_EXEC_1A_1T_0R     AML_HAS_ARGS | AML_HAS_TARGET
+#define AML_FLAGS_EXEC_1A_1T_1R     AML_HAS_ARGS | AML_HAS_TARGET | AML_HAS_RETVAL      /* monadic2_r */
+#define AML_FLAGS_EXEC_2A_0T_0R     AML_HAS_ARGS        /* Dyadic1   */
+#define AML_FLAGS_EXEC_2A_0T_1R     AML_HAS_ARGS |                  AML_HAS_RETVAL      /* Dyadic2   */
+#define AML_FLAGS_EXEC_2A_1T_1R     AML_HAS_ARGS | AML_HAS_TARGET | AML_HAS_RETVAL      /* dyadic2_r  */
+#define AML_FLAGS_EXEC_2A_2T_1R     AML_HAS_ARGS | AML_HAS_TARGET | AML_HAS_RETVAL
+#define AML_FLAGS_EXEC_3A_0T_0R     AML_HAS_ARGS
+#define AML_FLAGS_EXEC_3A_1T_1R     AML_HAS_ARGS | AML_HAS_TARGET | AML_HAS_RETVAL
+#define AML_FLAGS_EXEC_6A_0T_1R     AML_HAS_ARGS |                  AML_HAS_RETVAL
+
+/*
+ * The opcode Type is used in a dispatch table, do not change
+ * without updating the table.
+ */
+#define AML_TYPE_EXEC_0A_0T_1R      0x00
+#define AML_TYPE_EXEC_1A_0T_0R      0x01        /* Monadic1  */
+#define AML_TYPE_EXEC_1A_0T_1R      0x02        /* Monadic2  */
+#define AML_TYPE_EXEC_1A_1T_0R      0x03
+#define AML_TYPE_EXEC_1A_1T_1R      0x04        /* monadic2_r */
+#define AML_TYPE_EXEC_2A_0T_0R      0x05        /* Dyadic1   */
+#define AML_TYPE_EXEC_2A_0T_1R      0x06        /* Dyadic2   */
+#define AML_TYPE_EXEC_2A_1T_1R      0x07        /* dyadic2_r  */
+#define AML_TYPE_EXEC_2A_2T_1R      0x08
+#define AML_TYPE_EXEC_3A_0T_0R      0x09
+#define AML_TYPE_EXEC_3A_1T_1R      0x0A
+#define AML_TYPE_EXEC_6A_0T_1R      0x0B
+/* End of types used in dispatch table */
+
+#define AML_TYPE_LITERAL            0x0B
+#define AML_TYPE_CONSTANT           0x0C
+#define AML_TYPE_METHOD_ARGUMENT    0x0D
+#define AML_TYPE_LOCAL_VARIABLE     0x0E
+#define AML_TYPE_DATA_TERM          0x0F
+
+/* Generic for an op that returns a value */
+
+#define AML_TYPE_METHOD_CALL        0x10
+
+/* Misc */
+
+#define AML_TYPE_CREATE_FIELD       0x11
+#define AML_TYPE_CREATE_OBJECT      0x12
+#define AML_TYPE_CONTROL            0x13
+#define AML_TYPE_NAMED_NO_OBJ       0x14
+#define AML_TYPE_NAMED_FIELD        0x15
+#define AML_TYPE_NAMED_SIMPLE       0x16
+#define AML_TYPE_NAMED_COMPLEX      0x17
+#define AML_TYPE_RETURN             0x18
+
+#define AML_TYPE_UNDEFINED          0x19
+#define AML_TYPE_BOGUS              0x1A
+
+/* AML Package Length encodings */
+
+#define ACPI_AML_PACKAGE_TYPE1      0x40
+#define ACPI_AML_PACKAGE_TYPE2      0x4000
+#define ACPI_AML_PACKAGE_TYPE3      0x400000
+#define ACPI_AML_PACKAGE_TYPE4      0x40000000
+
+/*
+ * Opcode classes
+ */
+#define AML_CLASS_EXECUTE           0x00
+#define AML_CLASS_CREATE            0x01
+#define AML_CLASS_ARGUMENT          0x02
+#define AML_CLASS_NAMED_OBJECT      0x03
+#define AML_CLASS_CONTROL           0x04
+#define AML_CLASS_ASCII             0x05
+#define AML_CLASS_PREFIX            0x06
+#define AML_CLASS_INTERNAL          0x07
+#define AML_CLASS_RETURN_VALUE      0x08
+#define AML_CLASS_METHOD_CALL       0x09
+#define AML_CLASS_UNKNOWN           0x0A
+
+/* Predefined Operation Region space_iDs */
+
+typedef enum {
+        REGION_MEMORY = 0,
+        REGION_IO,
+        REGION_PCI_CONFIG,
+        REGION_EC,
+        REGION_SMBUS,
+        REGION_CMOS,
+        REGION_PCI_BAR,
+        REGION_DATA_TABLE,      /* Internal use only */
+        REGION_FIXED_HW = 0x7F
+} AML_REGION_TYPES;
+
+/* Comparison operation codes for match_op operator */
+
+typedef enum {
+        MATCH_MTR = 0,
+        MATCH_MEQ = 1,
+        MATCH_MLE = 2,
+        MATCH_MLT = 3,
+        MATCH_MGE = 4,
+        MATCH_MGT = 5
+} AML_MATCH_OPERATOR;
+
+#define MAX_MATCH_OPERATOR          5
+
+/*
+ * field_flags
+ *
+ * This byte is extracted from the AML and includes three separate
+ * pieces of information about the field:
+ * 1) The field access type
+ * 2) The field update rule
+ * 3) The lock rule for the field
+ *
+ * Bits 00 - 03 : access_type (any_acc, byte_acc, etc.)
+ *      04      : lock_rule (1 == Lock)
+ *      05 - 06 : update_rule
+ */
+#define AML_FIELD_ACCESS_TYPE_MASK  0x0F
+#define AML_FIELD_LOCK_RULE_MASK    0x10
+#define AML_FIELD_UPDATE_RULE_MASK  0x60
+
+/* 1) Field Access Types */
+
+typedef enum {
+        AML_FIELD_ACCESS_ANY = 0x00,
+        AML_FIELD_ACCESS_BYTE = 0x01,
+        AML_FIELD_ACCESS_WORD = 0x02,
+        AML_FIELD_ACCESS_DWORD = 0x03,
+        AML_FIELD_ACCESS_QWORD = 0x04,  /* ACPI 2.0 */
+        AML_FIELD_ACCESS_BUFFER = 0x05  /* ACPI 2.0 */
+} AML_ACCESS_TYPE;
+
+/* 2) Field Lock Rules */
+
+typedef enum {
+        AML_FIELD_LOCK_NEVER = 0x00,
+        AML_FIELD_LOCK_ALWAYS = 0x10
+} AML_LOCK_RULE;
+
+/* 3) Field Update Rules */
+
+typedef enum {
+        AML_FIELD_UPDATE_PRESERVE = 0x00,
+        AML_FIELD_UPDATE_WRITE_AS_ONES = 0x20,
+        AML_FIELD_UPDATE_WRITE_AS_ZEROS = 0x40
+} AML_UPDATE_RULE;
+
+/*
+ * Field Access Attributes.
+ * This byte is extracted from the AML via the
+ * access_as keyword
+ */
+typedef enum {
+        AML_FIELD_ATTRIB_SMB_QUICK = 0x02,
+        AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04,
+        AML_FIELD_ATTRIB_SMB_BYTE = 0x06,
+        AML_FIELD_ATTRIB_SMB_WORD = 0x08,
+        AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A,
+        AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C,
+        AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
+} AML_ACCESS_ATTRIBUTE;
+
+/* Bit fields in method_flags byte */
+
+#define AML_METHOD_ARG_COUNT        0x07
+#define AML_METHOD_SERIALIZED       0x08
+#define AML_METHOD_SYNCH_LEVEL      0xF0
+
+/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */
+
+#define AML_METHOD_INTERNAL_ONLY    0x01
+#define AML_METHOD_RESERVED1        0x02
+#define AML_METHOD_RESERVED2        0x04
+
+#endif                          /* __AMLCODE_H__ */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
new file mode 100644
index 000000000000..7b070e42b7c5
--- /dev/null
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -0,0 +1,311 @@
+
+/******************************************************************************
+ *
+ * Module Name: amlresrc.h - AML resource descriptors
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/* acpisrc:struct_defs -- for acpisrc conversion */
+
+#ifndef __AMLRESRC_H
+#define __AMLRESRC_H
+
+/*
+ * Resource descriptor tags, as defined in the ACPI specification.
+ * Used to symbolically reference fields within a descriptor.
+ */
+#define ACPI_RESTAG_ADDRESS                     "_ADR"
+#define ACPI_RESTAG_ALIGNMENT                   "_ALN"
+#define ACPI_RESTAG_ADDRESSSPACE                "_ASI"
+#define ACPI_RESTAG_ACCESSSIZE                  "_ASZ"
+#define ACPI_RESTAG_TYPESPECIFICATTRIBUTES      "_ATT"
+#define ACPI_RESTAG_BASEADDRESS                 "_BAS"
+#define ACPI_RESTAG_BUSMASTER                   "_BM_"  /* Master(1), Slave(0) */
+#define ACPI_RESTAG_DECODE                      "_DEC"
+#define ACPI_RESTAG_DMA                         "_DMA"
+#define ACPI_RESTAG_DMATYPE                     "_TYP"  /* Compatible(0), A(1), B(2), F(3) */
+#define ACPI_RESTAG_GRANULARITY                 "_GRA"
+#define ACPI_RESTAG_INTERRUPT                   "_INT"
+#define ACPI_RESTAG_INTERRUPTLEVEL              "_LL_"  /* active_lo(1), active_hi(0) */
+#define ACPI_RESTAG_INTERRUPTSHARE              "_SHR"  /* Shareable(1), no_share(0) */
+#define ACPI_RESTAG_INTERRUPTTYPE               "_HE_"  /* Edge(1), Level(0) */
+#define ACPI_RESTAG_LENGTH                      "_LEN"
+#define ACPI_RESTAG_MEMATTRIBUTES               "_MTP"  /* Memory(0), Reserved(1), ACPI(2), NVS(3) */
+#define ACPI_RESTAG_MEMTYPE                     "_MEM"  /* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */
+#define ACPI_RESTAG_MAXADDR                     "_MAX"
+#define ACPI_RESTAG_MINADDR                     "_MIN"
+#define ACPI_RESTAG_MAXTYPE                     "_MAF"
+#define ACPI_RESTAG_MINTYPE                     "_MIF"
+#define ACPI_RESTAG_REGISTERBITOFFSET           "_RBO"
+#define ACPI_RESTAG_REGISTERBITWIDTH            "_RBW"
+#define ACPI_RESTAG_RANGETYPE                   "_RNG"
+#define ACPI_RESTAG_READWRITETYPE               "_RW_"  /* read_only(0), Writeable (1) */
+#define ACPI_RESTAG_TRANSLATION                 "_TRA"
+#define ACPI_RESTAG_TRANSTYPE                   "_TRS"  /* Sparse(1), Dense(0) */
+#define ACPI_RESTAG_TYPE                        "_TTP"  /* Translation(1), Static (0) */
+#define ACPI_RESTAG_XFERTYPE                    "_SIZ"  /* 8(0), 8_and16(1), 16(2) */
+
+/* Default sizes for "small" resource descriptors */
+
+#define ASL_RDESC_IRQ_SIZE                      0x02
+#define ASL_RDESC_DMA_SIZE                      0x02
+#define ASL_RDESC_ST_DEPEND_SIZE                0x00
+#define ASL_RDESC_END_DEPEND_SIZE               0x00
+#define ASL_RDESC_IO_SIZE                       0x07
+#define ASL_RDESC_FIXED_IO_SIZE                 0x03
+#define ASL_RDESC_END_TAG_SIZE                  0x01
+
+struct asl_resource_node {
+        u32 buffer_length;
+        void *buffer;
+        struct asl_resource_node *next;
+};
+
+/* Macros used to generate AML resource length fields */
+
+#define ACPI_AML_SIZE_LARGE(r)      (sizeof (r) - sizeof (struct aml_resource_large_header))
+#define ACPI_AML_SIZE_SMALL(r)      (sizeof (r) - sizeof (struct aml_resource_small_header))
+
+/*
+ * Resource descriptors defined in the ACPI specification.
+ *
+ * Packing/alignment must be BYTE because these descriptors
+ * are used to overlay the raw AML byte stream.
+ */
+#pragma pack(1)
+
+/*
+ * SMALL descriptors
+ */
+#define AML_RESOURCE_SMALL_HEADER_COMMON \
+        u8                              descriptor_type;
+
+struct aml_resource_small_header {
+AML_RESOURCE_SMALL_HEADER_COMMON};
+
+struct aml_resource_irq {
+        AML_RESOURCE_SMALL_HEADER_COMMON u16 irq_mask;
+        u8 flags;
+};
+
+struct aml_resource_irq_noflags {
+        AML_RESOURCE_SMALL_HEADER_COMMON u16 irq_mask;
+};
+
+struct aml_resource_dma {
+        AML_RESOURCE_SMALL_HEADER_COMMON u8 dma_channel_mask;
+        u8 flags;
+};
+
+struct aml_resource_start_dependent {
+        AML_RESOURCE_SMALL_HEADER_COMMON u8 flags;
+};
+
+struct aml_resource_start_dependent_noprio {
+AML_RESOURCE_SMALL_HEADER_COMMON};
+
+struct aml_resource_end_dependent {
+AML_RESOURCE_SMALL_HEADER_COMMON};
+
+struct aml_resource_io {
+        AML_RESOURCE_SMALL_HEADER_COMMON u8 flags;
+        u16 minimum;
+        u16 maximum;
+        u8 alignment;
+        u8 address_length;
+};
+
+struct aml_resource_fixed_io {
+        AML_RESOURCE_SMALL_HEADER_COMMON u16 address;
+        u8 address_length;
+};
+
+struct aml_resource_vendor_small {
+AML_RESOURCE_SMALL_HEADER_COMMON};
+
+struct aml_resource_end_tag {
+        AML_RESOURCE_SMALL_HEADER_COMMON u8 checksum;
+};
+
+/*
+ * LARGE descriptors
+ */
+#define AML_RESOURCE_LARGE_HEADER_COMMON \
+        u8                              descriptor_type;\
+        u16                             resource_length;
+
+struct aml_resource_large_header {
+AML_RESOURCE_LARGE_HEADER_COMMON};
+
+struct aml_resource_memory24 {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
+        u16 minimum;
+        u16 maximum;
+        u16 alignment;
+        u16 address_length;
+};
+
+struct aml_resource_vendor_large {
+AML_RESOURCE_LARGE_HEADER_COMMON};
+
+struct aml_resource_memory32 {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
+        u32 minimum;
+        u32 maximum;
+        u32 alignment;
+        u32 address_length;
+};
+
+struct aml_resource_fixed_memory32 {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
+        u32 address;
+        u32 address_length;
+};
+
+#define AML_RESOURCE_ADDRESS_COMMON \
+        u8                              resource_type; \
+        u8                              flags; \
+        u8                              specific_flags;
+
+struct aml_resource_address {
+AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_ADDRESS_COMMON};
+
+struct aml_resource_extended_address64 {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_ADDRESS_COMMON u8 revision_iD;
+        u8 reserved;
+        u64 granularity;
+        u64 minimum;
+        u64 maximum;
+        u64 translation_offset;
+        u64 address_length;
+        u64 type_specific;
+};
+
+#define AML_RESOURCE_EXTENDED_ADDRESS_REVISION          1       /* ACPI 3.0 */
+
+struct aml_resource_address64 {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_ADDRESS_COMMON u64 granularity;
+        u64 minimum;
+        u64 maximum;
+        u64 translation_offset;
+        u64 address_length;
+};
+
+struct aml_resource_address32 {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_ADDRESS_COMMON u32 granularity;
+        u32 minimum;
+        u32 maximum;
+        u32 translation_offset;
+        u32 address_length;
+};
+
+struct aml_resource_address16 {
+        AML_RESOURCE_LARGE_HEADER_COMMON
+            AML_RESOURCE_ADDRESS_COMMON u16 granularity;
+        u16 minimum;
+        u16 maximum;
+        u16 translation_offset;
+        u16 address_length;
+};
+
+struct aml_resource_extended_irq {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
+        u8 interrupt_count;
+        u32 interrupts[1];
+        /* res_source_index, res_source optional fields follow */
+};
+
+struct aml_resource_generic_register {
+        AML_RESOURCE_LARGE_HEADER_COMMON u8 address_space_id;
+        u8 bit_width;
+        u8 bit_offset;
+        u8 access_size;         /* ACPI 3.0, was previously Reserved */
+        u64 address;
+};
+
+/* restore default alignment */
+
+#pragma pack()
+
+/* Union of all resource descriptors, so we can allocate the worst case */
+
+union aml_resource {
+        /* Descriptor headers */
+
+        u8 descriptor_type;
+        struct aml_resource_small_header small_header;
+        struct aml_resource_large_header large_header;
+
+        /* Small resource descriptors */
+
+        struct aml_resource_irq irq;
+        struct aml_resource_dma dma;
+        struct aml_resource_start_dependent start_dpf;
+        struct aml_resource_end_dependent end_dpf;
+        struct aml_resource_io io;
+        struct aml_resource_fixed_io fixed_io;
+        struct aml_resource_vendor_small vendor_small;
+        struct aml_resource_end_tag end_tag;
+
+        /* Large resource descriptors */
+
+        struct aml_resource_memory24 memory24;
+        struct aml_resource_generic_register generic_reg;
+        struct aml_resource_vendor_large vendor_large;
+        struct aml_resource_memory32 memory32;
+        struct aml_resource_fixed_memory32 fixed_memory32;
+        struct aml_resource_address16 address16;
+        struct aml_resource_address32 address32;
+        struct aml_resource_address64 address64;
+        struct aml_resource_extended_address64 ext_address64;
+        struct aml_resource_extended_irq extended_irq;
+
+        /* Utility overlays */
+
+        struct aml_resource_address address;
+        u32 dword_item;
+        u16 word_item;
+        u8 byte_item;
+};
+
+#endif
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/acpica/dsfield.c
index f988a5e7d2b4..53e27bc5a734 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -42,11 +42,12 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsfield")
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/acpica/dsinit.c
index 949f7c75029e..eb144b13d8fa 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
-#include <acpi/acnamesp.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acdispat.h"
+#include "acnamesp.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsinit")
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 279a5a60a0dd..14b8b8ed8023 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -42,11 +42,14 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#ifdef  ACPI_DISASSEMBLER
 #include <acpi/acdisasm.h>
+#endif
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsmethod")
@@ -412,6 +415,9 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 
         if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
                 status = obj_desc->method.implementation(next_walk_state);
+                if (status == AE_OK) {
+                        status = AE_CTRL_TERMINATE;
+                }
         }
 
         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index d03f81bd1bcb..da0f5468184c 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acdispat.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsmthdat")
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 4f08e599d07e..15c628e6aa00 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -42,11 +42,12 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsobject")
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 69fae5905bb8..0c3b4dd60e8a 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -43,13 +43,14 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acevents.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsopcode")
@@ -1140,10 +1141,29 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
                           op->common.aml_opcode, walk_state));
 
         switch (op->common.aml_opcode) {
-        case AML_IF_OP:
         case AML_WHILE_OP:
 
                 /*
+                 * If this is an additional iteration of a while loop, continue.
+                 * There is no need to allocate a new control state.
+                 */
+                if (walk_state->control_state) {
+                        if (walk_state->control_state->control.aml_predicate_start
+                                == (walk_state->parser_state.aml - 1)) {
+
+                                /* Reset the state to start-of-loop */
+
+                                walk_state->control_state->common.state =
+                                    ACPI_CONTROL_CONDITIONAL_EXECUTING;
+                                break;
+                        }
+                }
+
+                /*lint -fallthrough */
+
+        case AML_IF_OP:
+
+                /*
                  * IF/WHILE: Create a new control state to manage these
                  * constructs. We need to manage these as a stack, in order
                  * to handle nesting.
@@ -1243,13 +1263,36 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[WHILE_OP] Op=%p\n", op));
 
-                if (walk_state->control_state->common.value) {
+                control_state = walk_state->control_state;
+                if (control_state->common.value) {
 
-                        /* Predicate was true, go back and evaluate it again! */
+                        /* Predicate was true, the body of the loop was just executed */
 
+                        /*
+                         * This loop counter mechanism allows the interpreter to escape
+                         * possibly infinite loops. This can occur in poorly written AML
+                         * when the hardware does not respond within a while loop and the
+                         * loop does not implement a timeout.
+                         */
+                        control_state->control.loop_count++;
+                        if (control_state->control.loop_count >
+                                ACPI_MAX_LOOP_ITERATIONS) {
+                                status = AE_AML_INFINITE_LOOP;
+                                break;
+                        }
+
+                        /*
+                         * Go back and evaluate the predicate and maybe execute the loop
+                         * another time
+                         */
                         status = AE_CTRL_PENDING;
+                        walk_state->aml_last_while =
+                            control_state->control.aml_predicate_start;
+                        break;
                 }
 
+                /* Predicate was false, terminate this while loop */
+
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                                   "[WHILE_OP] termination! Op=%p\n", op));
 
@@ -1257,9 +1300,6 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
                 control_state =
                     acpi_ut_pop_generic_state(&walk_state->control_state);
-
-                walk_state->aml_last_while =
-                    control_state->control.aml_predicate_start;
                 acpi_ut_delete_generic_state(control_state);
                 break;
 
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/acpica/dsutils.c
index b398982f0d8b..dabc23a46176 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -42,12 +42,13 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsutils")
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 396fe12078cd..350e6656bc89 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -43,12 +43,13 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswexec")
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/acpica/dswload.c
index dff7a3e445a8..3023ceaa8d54 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -42,12 +42,13 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acevents.h"
 
 #ifdef ACPI_ASL_COMPILER
 #include <acpi/acdisasm.h>
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/acpica/dswscope.c
index 9e6073265873..908645e72f03 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
+#include "accommon.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswscope")
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/acpica/dswstate.c
index b00d4af791aa..40f92bf7dce5 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswstate")
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/acpica/evevent.c
index c56c5c6ea77b..803edd9e3f6a 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evevent")
@@ -72,8 +73,8 @@ acpi_status acpi_ev_initialize_events(void)
 
         /*
          * Initialize the Fixed and General Purpose Events. This is done prior to
-         * enabling SCIs to prevent interrupts from occurring before the handlers are
-         * installed.
+         * enabling SCIs to prevent interrupts from occurring before the handlers
+         * are installed.
          */
         status = acpi_ev_fixed_event_initialize();
         if (ACPI_FAILURE(status)) {
@@ -192,8 +193,8 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
         acpi_status status;
 
         /*
-         * Initialize the structure that keeps track of fixed event handlers
-         * and enable the fixed events.
+         * Initialize the structure that keeps track of fixed event handlers and
+         * enable the fixed events.
          */
         for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
                 acpi_gbl_fixed_event_handlers[i].handler = NULL;
@@ -237,7 +238,7 @@ u32 acpi_ev_fixed_event_detect(void)
 
         /*
          * Read the fixed feature status and enable registers, as all the cases
-         * depend on their values.  Ignore errors here.
+         * depend on their values. Ignore errors here.
          */
         (void)acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS, &fixed_status);
         (void)acpi_hw_register_read(ACPI_REGISTER_PM1_ENABLE, &fixed_enable);
@@ -291,8 +292,8 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
                                 status_register_id, 1);
 
         /*
-         * Make sure we've got a handler.  If not, report an error.
-         * The event is disabled to prevent further interrupts.
+         * Make sure we've got a handler. If not, report an error. The event is
+         * disabled to prevent further interrupts.
          */
         if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
                 (void)acpi_set_register(acpi_gbl_fixed_event_info[event].
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/acpica/evgpe.c
index f45c74fe745e..f345ced36477 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpe")
@@ -125,7 +126,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
             (1 <<
              (gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
 
-        /* 1) Disable case.  Simply clear all enable bits */
+        /* 1) Disable case. Simply clear all enable bits */
 
         if (type == ACPI_GPE_DISABLE) {
                 ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
@@ -134,7 +135,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
                 return_ACPI_STATUS(AE_OK);
         }
 
-        /* 2) Enable case.  Set/Clear the appropriate enable bits */
+        /* 2) Enable case. Set/Clear the appropriate enable bits */
 
         switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
         case ACPI_GPE_TYPE_WAKE:
@@ -295,7 +296,7 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  * FUNCTION:    acpi_ev_get_gpe_event_info
  *
- * PARAMETERS:  gpe_device          - Device node.  NULL for GPE0/GPE1
+ * PARAMETERS:  gpe_device          - Device node. NULL for GPE0/GPE1
  *              gpe_number          - Raw GPE number
  *
  * RETURN:      A GPE event_info struct. NULL if not a valid GPE
@@ -372,7 +373,7 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
  *
  * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED
  *
- * DESCRIPTION: Detect if any GP events have occurred.  This function is
+ * DESCRIPTION: Detect if any GP events have occurred. This function is
  *              executed at interrupt level.
  *
  ******************************************************************************/
@@ -400,8 +401,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
 
         /*
          * We need to obtain the GPE lock for both the data structs and registers
-         * Note: Not necessary to obtain the hardware lock, since the GPE registers
-         * are owned by the gpe_lock.
+         * Note: Not necessary to obtain the hardware lock, since the GPE
+         * registers are owned by the gpe_lock.
          */
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
@@ -410,9 +411,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
         gpe_block = gpe_xrupt_list->gpe_block_list_head;
         while (gpe_block) {
                 /*
-                 * Read all of the 8-bit GPE status and enable registers
-                 * in this GPE block, saving all of them.
-                 * Find all currently active GP events.
+                 * Read all of the 8-bit GPE status and enable registers in this GPE
+                 * block, saving all of them. Find all currently active GP events.
                  */
                 for (i = 0; i < gpe_block->register_count; i++) {
 
@@ -423,10 +423,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         /* Read the Status Register */
 
                         status =
-                            acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH,
-                                                   &status_reg,
-                                                   &gpe_register_info->
-                                                   status_address);
+                            acpi_read(&status_reg,
+                                      &gpe_register_info->status_address);
                         if (ACPI_FAILURE(status)) {
                                 goto unlock_and_exit;
                         }
@@ -434,10 +432,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         /* Read the Enable Register */
 
                         status =
-                            acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH,
-                                                   &enable_reg,
-                                                   &gpe_register_info->
-                                                   enable_address);
+                            acpi_read(&enable_reg,
+                                      &gpe_register_info->enable_address);
                         if (ACPI_FAILURE(status)) {
                                 goto unlock_and_exit;
                         }
@@ -527,8 +523,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
         (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
 
         /*
-         * Take a snapshot of the GPE info for this level - we copy the
-         * info to prevent a race condition with remove_handler/remove_block.
+         * Take a snapshot of the GPE info for this level - we copy the info to
+         * prevent a race condition with remove_handler/remove_block.
          */
         ACPI_MEMCPY(&local_gpe_event_info, gpe_event_info,
                     sizeof(struct acpi_gpe_event_info));
@@ -539,8 +535,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
         }
 
         /*
-         * Must check for control method type dispatch one more
-         * time to avoid race with ev_gpe_install_handler
+         * Must check for control method type dispatch one more time to avoid a
+         * race with ev_gpe_install_handler
          */
         if ((local_gpe_event_info.flags & ACPI_GPE_DISPATCH_MASK) ==
             ACPI_GPE_DISPATCH_METHOD) {
@@ -584,8 +580,8 @@ static void acpi_ev_asynch_enable_gpe(void *context)
         if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
             ACPI_GPE_LEVEL_TRIGGERED) {
                 /*
-                 * GPE is level-triggered, we clear the GPE status bit after
-                 * handling the event.
+                 * GPE is level-triggered, we clear the GPE status bit after handling
+                 * the event.
                  */
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
@@ -624,7 +620,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
         acpi_os_gpe_count(gpe_number);
 
         /*
-         * If edge-triggered, clear the GPE status bit now.  Note that
+         * If edge-triggered, clear the GPE status bit now. Note that
          * level-triggered events are cleared after the GPE is serviced.
          */
         if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
@@ -650,7 +646,8 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 
                 /*
                  * Invoke the installed handler (at interrupt level)
-                 * Ignore return status for now.  TBD: leave GPE disabled on error?
+                 * Ignore return status for now.
+                 * TBD: leave GPE disabled on error?
                  */
                 (void)gpe_event_info->dispatch.handler->address(gpe_event_info->
                                                                 dispatch.
@@ -708,7 +705,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                             gpe_number));
 
                 /*
-                 * Disable the GPE. The GPE will remain disabled until the ACPI
+                 * Disable the GPE. The GPE will remain disabled until the ACPICA
                  * Core Subsystem is restarted, or a handler is installed.
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 73c058e2f5c2..484cc0565d5b 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeblk")
@@ -124,6 +125,7 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
  * FUNCTION:    acpi_ev_walk_gpe_list
  *
  * PARAMETERS:  gpe_walk_callback   - Routine called for each GPE block
+ *              Context             - Value passed to callback
  *
  * RETURN:      Status
  *
@@ -131,7 +133,8 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
+acpi_status
+acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context)
 {
         struct acpi_gpe_block_info *gpe_block;
         struct acpi_gpe_xrupt_info *gpe_xrupt_info;
@@ -154,8 +157,13 @@ acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
 
                         /* One callback per GPE block */
 
-                        status = gpe_walk_callback(gpe_xrupt_info, gpe_block);
+                        status =
+                            gpe_walk_callback(gpe_xrupt_info, gpe_block,
+                                              context);
                         if (ACPI_FAILURE(status)) {
+                                if (status == AE_CTRL_END) {    /* Callback abort */
+                                        status = AE_OK;
+                                }
                                 goto unlock_and_exit;
                         }
 
@@ -186,7 +194,8 @@ acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
 
 acpi_status
 acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                            struct acpi_gpe_block_info *gpe_block)
+                            struct acpi_gpe_block_info *gpe_block,
+                            void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info;
         u32 i;
@@ -309,17 +318,17 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
              (gpe_block->block_base_number +
               (gpe_block->register_count * 8)))) {
                 /*
-                 * Not valid for this GPE block, just ignore it
-                 * However, it may be valid for a different GPE block, since GPE0 and GPE1
-                 * methods both appear under \_GPE.
+                 * Not valid for this GPE block, just ignore it. However, it may be
+                 * valid for a different GPE block, since GPE0 and GPE1 methods both
+                 * appear under \_GPE.
                  */
                 return_ACPI_STATUS(AE_OK);
         }
 
         /*
-         * Now we can add this information to the gpe_event_info block
-         * for use during dispatch of this GPE. Default type is RUNTIME, although
-         * this may change when the _PRW methods are executed later.
+         * Now we can add this information to the gpe_event_info block for use
+         * during dispatch of this GPE. Default type is RUNTIME, although this may
+         * change when the _PRW methods are executed later.
          */
         gpe_event_info =
             &gpe_block->event_info[gpe_number - gpe_block->block_base_number];
@@ -394,8 +403,8 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
         gpe_block = gpe_info->gpe_block;
 
         /*
-         * The _PRW object must return a package, we are only interested
-         * in the first element
+         * The _PRW object must return a package, we are only interested in the
+         * first element
          */
         obj_desc = pkg_desc->package.elements[0];
 
@@ -434,7 +443,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
         /*
          * Is this GPE within this block?
          *
-         * TRUE iff these conditions are true:
+         * TRUE if and only if these conditions are true:
          *     1) The GPE devices match.
          *     2) The GPE index(number) is within the range of the Gpe Block
          *          associated with the GPE device.
@@ -457,6 +466,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
                 if (ACPI_FAILURE(status)) {
                         goto cleanup;
                 }
+
                 status =
                     acpi_ev_update_gpe_enable_masks(gpe_event_info,
                                                     ACPI_GPE_DISABLE);
@@ -476,9 +486,9 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
  * RETURN:      A GPE interrupt block
  *
  * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
- *              block per unique interrupt level used for GPEs.
- *              Should be called only when the GPE lists are semaphore locked
- *              and not subject to change.
+ *              block per unique interrupt level used for GPEs. Should be
+ *              called only when the GPE lists are semaphore locked and not
+ *              subject to change.
  *
  ******************************************************************************/
 
@@ -608,8 +618,9 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
  *
  * FUNCTION:    acpi_ev_install_gpe_block
  *
- * PARAMETERS:  gpe_block       - New GPE block
- *              interrupt_number - Xrupt to be associated with this GPE block
+ * PARAMETERS:  gpe_block               - New GPE block
+ *              interrupt_number        - Xrupt to be associated with this
+ *                                        GPE block
  *
  * RETURN:      Status
  *
@@ -666,7 +677,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
  *
  * FUNCTION:    acpi_ev_delete_gpe_block
  *
- * PARAMETERS:  gpe_block       - Existing GPE block
+ * PARAMETERS:  gpe_block           - Existing GPE block
  *
  * RETURN:      Status
  *
@@ -688,7 +699,8 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
 
         /* Disable all GPEs in this block */
 
-        status = acpi_hw_disable_gpe_block(gpe_block->xrupt_block, gpe_block);
+        status =
+            acpi_hw_disable_gpe_block(gpe_block->xrupt_block, gpe_block, NULL);
 
         if (!gpe_block->previous && !gpe_block->next) {
 
@@ -715,6 +727,9 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
                 acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         }
 
+        acpi_current_gpe_count -=
+            gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH;
+
         /* Free the gpe_block */
 
         ACPI_FREE(gpe_block->register_info);
@@ -786,9 +801,9 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 
         /*
          * Initialize the GPE Register and Event structures. A goal of these
-         * tables is to hide the fact that there are two separate GPE register sets
-         * in a given GPE hardware block, the status registers occupy the first half,
-         * and the enable registers occupy the second half.
+         * tables is to hide the fact that there are two separate GPE register
+         * sets in a given GPE hardware block, the status registers occupy the
+         * first half, and the enable registers occupy the second half.
          */
         this_register = gpe_register_info;
         this_event = gpe_event_info;
@@ -816,10 +831,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                     ACPI_GPE_REGISTER_WIDTH;
                 this_register->enable_address.bit_width =
                     ACPI_GPE_REGISTER_WIDTH;
-                this_register->status_address.bit_offset =
-                    ACPI_GPE_REGISTER_WIDTH;
-                this_register->enable_address.bit_offset =
-                    ACPI_GPE_REGISTER_WIDTH;
+                this_register->status_address.bit_offset = 0;
+                this_register->enable_address.bit_offset = 0;
 
                 /* Init the event_info for each GPE within this register */
 
@@ -832,18 +845,14 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
 
                 /* Disable all GPEs within this register */
 
-                status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0x00,
-                                                 &this_register->
-                                                 enable_address);
+                status = acpi_write(0x00, &this_register->enable_address);
                 if (ACPI_FAILURE(status)) {
                         goto error_exit;
                 }
 
                 /* Clear any pending GPE events within this register */
 
-                status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0xFF,
-                                                 &this_register->
-                                                 status_address);
+                status = acpi_write(0xFF, &this_register->status_address);
                 if (ACPI_FAILURE(status)) {
                         goto error_exit;
                 }
@@ -956,6 +965,9 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                           gpe_device->name.ascii, gpe_block->register_count,
                           interrupt_number));
 
+        /* Update global count of currently available GPEs */
+
+        acpi_current_gpe_count += register_count * ACPI_GPE_REGISTER_WIDTH;
         return_ACPI_STATUS(AE_OK);
 }
 
@@ -1055,7 +1067,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
         /* Enable all valid runtime GPEs found above */
 
-        status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
+        status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
         if (ACPI_FAILURE(status)) {
                 ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
                             gpe_block));
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 1d5670be729a..5f893057bcc6 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -42,18 +42,15 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evmisc")
 
-/* Pointer to FACS needed for the Global Lock */
-static struct acpi_table_facs *facs = NULL;
-
 /* Local prototypes */
-
 static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context);
 
 static u32 acpi_ev_global_lock_handler(void *context);
@@ -152,7 +149,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                         break;
 
                 default:
+
                         /* All other types are not supported */
+
                         return (AE_TYPE);
                 }
         }
@@ -193,9 +192,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                         acpi_ut_delete_generic_state(notify_info);
                 }
         } else {
-                /*
-                 * There is no notify handler (per-device or system) for this device.
-                 */
+                /* 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",
                                   acpi_ut_get_node_name(node), notify_value,
@@ -229,9 +227,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
         ACPI_FUNCTION_ENTRY();
 
         /*
-         * We will invoke a global notify handler if installed.
-         * This is done _before_ we invoke the per-device handler attached
-         * to the device.
+         * We will invoke a global notify handler if installed. This is done
+         * _before_ we invoke the per-device handler attached to the device.
          */
         if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) {
 
@@ -299,7 +296,7 @@ static u32 acpi_ev_global_lock_handler(void *context)
          * If we don't get it now, it will be marked pending and we will
          * take another interrupt when it becomes free.
          */
-        ACPI_ACQUIRE_GLOBAL_LOCK(facs, acquired);
+        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
         if (acquired) {
 
                 /* Got the lock, now wake all threads waiting for it */
@@ -336,34 +333,27 @@ 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,
-                                         ACPI_CAST_INDIRECT_PTR(struct
-                                                                acpi_table_header,
-                                                                &facs));
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
+        /* Attempt installation of the global lock handler */
 
-        acpi_gbl_global_lock_present = TRUE;
         status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
                                                   acpi_ev_global_lock_handler,
                                                   NULL);
 
         /*
-         * If the global lock does not exist on this platform, the attempt
-         * to enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick)
-         * Map to AE_OK, but mark global lock as not present.
-         * Any attempt to actually use the global lock will be flagged
-         * with an error.
+         * If the global lock does not exist on this platform, the attempt to
+         * enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick).
+         * Map to AE_OK, but mark global lock as not present. Any attempt to
+         * actually use the global lock will be flagged with an error.
          */
         if (status == AE_NO_HARDWARE_RESPONSE) {
                 ACPI_ERROR((AE_INFO,
                             "No response from Global Lock hardware, disabling lock"));
 
                 acpi_gbl_global_lock_present = FALSE;
-                status = AE_OK;
+                return_ACPI_STATUS(AE_OK);
         }
 
+        acpi_gbl_global_lock_present = TRUE;
         return_ACPI_STATUS(status);
 }
 
@@ -462,8 +452,8 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
         }
 
         /*
-         * Make sure that a global lock actually exists. If not, just treat
-         * the lock as a standard mutex.
+         * Make sure that a global lock actually exists. If not, just treat the
+         * lock as a standard mutex.
          */
         if (!acpi_gbl_global_lock_present) {
                 acpi_gbl_global_lock_acquired = TRUE;
@@ -472,7 +462,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
 
         /* Attempt to acquire the actual hardware lock */
 
-        ACPI_ACQUIRE_GLOBAL_LOCK(facs, acquired);
+        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
         if (acquired) {
 
                 /* We got the lock */
@@ -536,7 +526,7 @@ acpi_status acpi_ev_release_global_lock(void)
 
                 /* Allow any thread to release the lock */
 
-                ACPI_RELEASE_GLOBAL_LOCK(facs, pending);
+                ACPI_RELEASE_GLOBAL_LOCK(acpi_gbl_FACS, pending);
 
                 /*
                  * If the pending bit was set, we must write GBL_RLS to the control
@@ -582,8 +572,8 @@ void acpi_ev_terminate(void)
 
         if (acpi_gbl_events_initialized) {
                 /*
-                 * Disable all event-related functionality.
-                 * In all cases, on error, print a message but obviously we don't abort.
+                 * Disable all event-related functionality. In all cases, on error,
+                 * print a message but obviously we don't abort.
                  */
 
                 /* Disable all fixed events */
@@ -599,7 +589,7 @@ void acpi_ev_terminate(void)
 
                 /* Disable all GPEs in all GPE blocks */
 
-                status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block);
+                status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL);
 
                 /* Remove SCI handler */
 
@@ -617,7 +607,7 @@ void acpi_ev_terminate(void)
 
         /* Deallocate all handler objects installed within GPE info structs */
 
-        status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers);
+        status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL);
 
         /* Return to original mode if necessary */
 
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/acpica/evregion.c
index 236fbd1ca438..665c0887ab4d 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -42,22 +42,15 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evregion")
-#define ACPI_NUM_DEFAULT_SPACES     4
-static u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
-        ACPI_ADR_SPACE_SYSTEM_MEMORY,
-        ACPI_ADR_SPACE_SYSTEM_IO,
-        ACPI_ADR_SPACE_PCI_CONFIG,
-        ACPI_ADR_SPACE_DATA_TABLE
-};
 
 /* Local prototypes */
-
 static acpi_status
 acpi_ev_reg_run(acpi_handle obj_handle,
                 u32 level, void *context, void **return_value);
@@ -66,6 +59,17 @@ static acpi_status
 acpi_ev_install_handler(acpi_handle obj_handle,
                         u32 level, void *context, void **return_value);
 
+/* These are the address spaces that will get default handlers */
+
+#define ACPI_NUM_DEFAULT_SPACES     4
+
+static u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
+        ACPI_ADR_SPACE_SYSTEM_MEMORY,
+        ACPI_ADR_SPACE_SYSTEM_IO,
+        ACPI_ADR_SPACE_PCI_CONFIG,
+        ACPI_ADR_SPACE_DATA_TABLE
+};
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_install_region_handlers
@@ -91,18 +95,19 @@ acpi_status acpi_ev_install_region_handlers(void)
         }
 
         /*
-         * All address spaces (PCI Config, EC, SMBus) are scope dependent
-         * and registration must occur for a specific device.
+         * All address spaces (PCI Config, EC, SMBus) are scope dependent and
+         * registration must occur for a specific device.
          *
-         * In the case of the system memory and IO address spaces there is currently
-         * no device associated with the address space.  For these we use the root.
+         * In the case of the system memory and IO address spaces there is
+         * currently no device associated with the address space. For these we
+         * use the root.
          *
-         * We install the default PCI config space handler at the root so
-         * that this space is immediately available even though the we have
-         * not enumerated all the PCI Root Buses yet.  This is to conform
-         * to the ACPI specification which states that the PCI config
-         * space must be always available -- even though we are nowhere
-         * near ready to find the PCI root buses at this point.
+         * We install the default PCI config space handler at the root so that
+         * this space is immediately available even though the we have not
+         * enumerated all the PCI Root Buses yet. This is to conform to the ACPI
+         * specification which states that the PCI config space must be always
+         * available -- even though we are nowhere near ready to find the PCI root
+         * buses at this point.
          *
          * NOTE: We ignore AE_ALREADY_EXISTS because this means that a handler
          * has already been installed (via acpi_install_address_space_handler).
@@ -160,12 +165,11 @@ acpi_status acpi_ev_initialize_op_regions(void)
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * Run the _REG methods for op_regions in each default address space
-         */
-        for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
+        /* Run the _REG methods for op_regions in each default address space */
 
-                /* TBD: Make sure handler is the DEFAULT handler, otherwise
+        for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
+                /*
+                 * TBD: Make sure handler is the DEFAULT handler, otherwise
                  * _REG will have already been run.
                  */
                 status = acpi_ev_execute_reg_methods(acpi_gbl_root_node,
@@ -318,13 +322,13 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         }
 
         /*
-         * It may be the case that the region has never been initialized
+         * It may be the case that the region has never been initialized.
          * Some types of regions require special init code
          */
         if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
-                /*
-                 * This region has not been initialized yet, do it
-                 */
+
+                /* This region has not been initialized yet, do it */
+
                 region_setup = handler_desc->address_space.setup;
                 if (!region_setup) {
 
@@ -339,9 +343,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 }
 
                 /*
-                 * We must exit the interpreter because the region
-                 * setup will potentially execute control methods
-                 * (e.g., _REG method for this region)
+                 * We must exit the interpreter because the region setup will
+                 * potentially execute control methods (for example, the _REG method
+                 * for this region)
                  */
                 acpi_ex_exit_interpreter();
 
@@ -364,9 +368,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                         return_ACPI_STATUS(status);
                 }
 
-                /*
-                 * Region initialization may have been completed by region_setup
-                 */
+                /* Region initialization may have been completed by region_setup */
+
                 if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
                         region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
 
@@ -521,8 +524,8 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                         }
 
                         /*
-                         * If the region has been activated, call the setup handler
-                         * with the deactivate notification
+                         * If the region has been activated, call the setup handler with
+                         * the deactivate notification
                          */
                         if (region_obj->region.flags & AOPOBJ_SETUP_COMPLETE) {
                                 region_setup = handler_obj->address_space.setup;
@@ -668,8 +671,8 @@ acpi_ev_install_handler(acpi_handle obj_handle,
         }
 
         /*
-         * We only care about regions.and objects
-         * that are allowed to have address space handlers
+         * We only care about regions and objects that are allowed to have
+         * address space handlers
          */
         if ((node->type != ACPI_TYPE_DEVICE) &&
             (node->type != ACPI_TYPE_REGION) && (node != acpi_gbl_root_node)) {
@@ -710,9 +713,9 @@ acpi_ev_install_handler(acpi_handle obj_handle,
                                 /*
                                  * Since the object we found it on was a device, then it
                                  * means that someone has already installed a handler for
-                                 * the branch of the namespace from this device on.  Just
+                                 * the branch of the namespace from this device on. Just
                                  * bail out telling the walk routine to not traverse this
-                                 * branch.  This preserves the scoping rule for handlers.
+                                 * branch. This preserves the scoping rule for handlers.
                                  */
                                 return (AE_CTRL_DEPTH);
                         }
@@ -723,9 +726,8 @@ acpi_ev_install_handler(acpi_handle obj_handle,
                 }
 
                 /*
-                 * As long as the device didn't have a handler for this
-                 * space we don't care about it.  We just ignore it and
-                 * proceed.
+                 * As long as the device didn't have a handler for this space we
+                 * don't care about it. We just ignore it and proceed.
                  */
                 return (AE_OK);
         }
@@ -733,16 +735,14 @@ acpi_ev_install_handler(acpi_handle obj_handle,
         /* Object is a Region */
 
         if (obj_desc->region.space_id != handler_obj->address_space.space_id) {
-                /*
-                 * This region is for a different address space
-                 * -- just ignore it
-                 */
+
+                /* This region is for a different address space, just ignore it */
+
                 return (AE_OK);
         }
 
         /*
-         * Now we have a region and it is for the handler's address
-         * space type.
+         * Now we have a region and it is for the handler's address space type.
          *
          * First disconnect region for any previous handler (if any)
          */
@@ -786,9 +786,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         ACPI_FUNCTION_TRACE(ev_install_space_handler);
 
         /*
-         * This registration is valid for only the types below
-         * and the root.  This is where the default handlers
-         * get placed.
+         * This registration is valid for only the types below and the root. This
+         * is where the default handlers get placed.
          */
         if ((node->type != ACPI_TYPE_DEVICE) &&
             (node->type != ACPI_TYPE_PROCESSOR) &&
@@ -848,8 +847,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         obj_desc = acpi_ns_get_attached_object(node);
         if (obj_desc) {
                 /*
-                 * The attached device object already exists.
-                 * Make sure the handler is not already installed.
+                 * The attached device object already exists. Make sure the handler
+                 * is not already installed.
                  */
                 handler_obj = obj_desc->device.handler;
 
@@ -864,8 +863,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
                                     handler) {
                                         /*
                                          * It is (relatively) OK to attempt to install the SAME
-                                         * handler twice. This can easily happen
-                                         * with PCI_Config space.
+                                         * handler twice. This can easily happen with the
+                                         * PCI_Config space.
                                          */
                                         status = AE_SAME_HANDLER;
                                         goto unlock_and_exit;
@@ -925,9 +924,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         /*
          * Install the handler
          *
-         * At this point there is no existing handler.
-         * Just allocate the object for the handler and link it
-         * into the list.
+         * At this point there is no existing handler. Just allocate the object
+         * for the handler and link it into the list.
          */
         handler_obj =
             acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_ADDRESS_HANDLER);
@@ -1000,11 +998,10 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
         ACPI_FUNCTION_TRACE(ev_execute_reg_methods);
 
         /*
-         * Run all _REG methods for all Operation Regions for this
-         * space ID.  This is a separate walk in order to handle any
-         * interdependencies between regions and _REG methods.  (i.e. handlers
-         * must be installed for all regions of this Space ID before we
-         * can run any _REG methods)
+         * Run all _REG methods for all Operation Regions for this space ID. This
+         * is a separate walk in order to handle any interdependencies between
+         * regions and _REG methods. (i.e. handlers must be installed for all
+         * regions of this Space ID before we can run any _REG methods)
          */
         status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, node, ACPI_UINT32_MAX,
                                         ACPI_NS_WALK_UNLOCK, acpi_ev_reg_run,
@@ -1042,8 +1039,8 @@ acpi_ev_reg_run(acpi_handle obj_handle,
         }
 
         /*
-         * We only care about regions.and objects
-         * that are allowed to have address space handlers
+         * We only care about regions.and objects that are allowed to have address
+         * space handlers
          */
         if ((node->type != ACPI_TYPE_REGION) && (node != acpi_gbl_root_node)) {
                 return (AE_OK);
@@ -1062,10 +1059,9 @@ acpi_ev_reg_run(acpi_handle obj_handle,
         /* Object is a Region */
 
         if (obj_desc->region.space_id != space_id) {
-                /*
-                 * This region is for a different address space
-                 * -- just ignore it
-                 */
+
+                /* This region is for a different address space, just ignore it */
+
                 return (AE_OK);
         }
 
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 6b94b38df07d..f3f1fb45c3dc 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evrgnini")
@@ -233,9 +234,9 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                 if (ACPI_FAILURE(status)) {
                                         if (status == AE_SAME_HANDLER) {
                                                 /*
-                                                 * It is OK if the handler is already installed on the root
-                                                 * bridge.  Still need to return a context object for the
-                                                 * new PCI_Config operation region, however.
+                                                 * It is OK if the handler is already installed on the
+                                                 * root bridge. Still need to return a context object
+                                                 * for the new PCI_Config operation region, however.
                                                  */
                                                 status = AE_OK;
                                         } else {
@@ -272,8 +273,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
         }
 
         /*
-         * For PCI_Config space access, we need the segment, bus,
-         * device and function numbers.  Acquire them here.
+         * For PCI_Config space access, we need the segment, bus, device and
+         * function numbers. Acquire them here.
          *
          * Find the parent device object. (This allows the operation region to be
          * within a subscope under the device, such as a control method.)
@@ -289,16 +290,16 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
         }
 
         /*
-         * Get the PCI device and function numbers from the _ADR object
-         * contained in the parent's scope.
+         * Get the PCI device and function numbers from the _ADR object contained
+         * in the parent's scope.
          */
         status =
             acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, pci_device_node,
                                             &pci_value);
 
         /*
-         * The default is zero, and since the allocation above zeroed
-         * the data, just do nothing on failure.
+         * The default is zero, and since the allocation above zeroed the data,
+         * just do nothing on failure.
          */
         if (ACPI_SUCCESS(status)) {
                 pci_id->device = ACPI_HIWORD(ACPI_LODWORD(pci_value));
@@ -382,9 +383,8 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
         struct acpi_compatible_id_list *cid;
         u32 i;
 
-        /*
-         * Get the _HID and check for a PCI Root Bridge
-         */
+        /* Get the _HID and check for a PCI Root Bridge */
+
         status = acpi_ut_execute_HID(node, &hid);
         if (ACPI_FAILURE(status)) {
                 return (FALSE);
@@ -394,10 +394,8 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
                 return (TRUE);
         }
 
-        /*
-         * The _HID did not match.
-         * Get the _CID and check for a PCI Root Bridge
-         */
+        /* The _HID did not match. Get the _CID and check for a PCI Root Bridge */
+
         status = acpi_ut_execute_CID(node, &cid);
         if (ACPI_FAILURE(status)) {
                 return (FALSE);
@@ -516,9 +514,9 @@ acpi_ev_default_region_setup(acpi_handle handle,
  *              Get the appropriate address space handler for a newly
  *              created region.
  *
- *              This also performs address space specific initialization.  For
+ *              This also performs address space specific initialization. For
  *              example, PCI regions must have an _ADR object that contains
- *              a PCI address in the scope of the definition.  This address is
+ *              a PCI address in the scope of the definition. This address is
  *              required to perform an access to PCI config space.
  *
  * MUTEX:       Interpreter should be unlocked, because we may run the _REG
@@ -572,7 +570,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
         if (ACPI_SUCCESS(status)) {
                 /*
                  * The _REG method is optional and there can be only one per region
-                 * definition.  This will be executed when the handler is attached
+                 * definition. This will be executed when the handler is attached
                  * or removed
                  */
                 region_obj2->extra.method_REG = method_node;
@@ -670,10 +668,8 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                         }
                 }
 
-                /*
-                 * This node does not have the handler we need;
-                 * Pop up one level
-                 */
+                /* This node does not have the handler we need; Pop up one level */
+
                 node = acpi_ns_get_parent_node(node);
         }
 
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/acpica/evsci.c
index 2a8b77877610..567b356c85af 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evsci")
@@ -115,10 +116,8 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
          * if this interrupt handler is installed, ACPI is enabled.
          */
 
-        /*
-         * GPEs:
-         * Check for and dispatch any GPEs that have occurred
-         */
+        /* GPEs: Check for and dispatch any GPEs that have occurred */
+
         interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
 
         return_UINT32(interrupt_handled);
@@ -158,11 +157,11 @@ u32 acpi_ev_install_sci_handler(void)
  * RETURN:      E_OK if handler uninstalled OK, E_ERROR if handler was not
  *              installed to begin with
  *
- * DESCRIPTION: Remove the SCI interrupt handler.  No further SCIs will be
+ * DESCRIPTION: Remove the SCI interrupt handler. No further SCIs will be
  *              taken.
  *
  * Note:  It doesn't seem important to disable all events or set the event
- *        enable registers to their original values.  The OS should disable
+ *        enable registers to their original values. The OS should disable
  *        the SCI interrupt level when the handler is removed, so no more
  *        events will come in.
  *
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/acpica/evxface.c
index 94a6efe020be..3aca9010a11e 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acevents.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxface")
@@ -267,7 +268,7 @@ acpi_install_notify_handler(acpi_handle device,
         /*
          * Root Object:
          * Registering a notify handler on the root object indicates that the
-         * caller wishes to receive notifications for all objects.  Note that
+         * caller wishes to receive notifications for all objects. Note that
          * only one <external> global handler can be regsitered (per notify type).
          */
         if (device == ACPI_ROOT_OBJECT) {
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 41554f736b68..35485e4b60a6 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -42,13 +42,19 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
 
+/* Local prototypes */
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable
@@ -60,6 +66,7 @@ ACPI_MODULE_NAME("evxfevnt")
  * DESCRIPTION: Transfers the system into ACPI mode.
  *
  ******************************************************************************/
+
 acpi_status acpi_enable(void)
 {
         acpi_status status = AE_OK;
@@ -161,8 +168,8 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
         }
 
         /*
-         * Enable the requested fixed event (by writing a one to the
-         * enable register bit)
+         * Enable the requested fixed event (by writing a one to the enable
+         * register bit)
          */
         status =
             acpi_set_register(acpi_gbl_fixed_event_info[event].
@@ -343,8 +350,8 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
         }
 
         /*
-         * Disable the requested fixed event (by writing a zero to the
-         * enable register bit)
+         * Disable the requested fixed event (by writing a zero to the enable
+         * register bit)
          */
         status =
             acpi_set_register(acpi_gbl_fixed_event_info[event].
@@ -396,8 +403,8 @@ acpi_status acpi_clear_event(u32 event)
         }
 
         /*
-         * Clear the requested fixed event (By writing a one to the
-         * status register bit)
+         * Clear the requested fixed event (By writing a one to the status
+         * register bit)
          */
         status =
             acpi_set_register(acpi_gbl_fixed_event_info[event].
@@ -717,3 +724,148 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_gpe_device
+ *
+ * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
+ *              gpe_device          - Where the parent GPE Device is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Obtain the GPE device associated with the input index. A NULL
+ *              gpe device indicates that the gpe number is contained in one of
+ *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
+{
+        struct acpi_gpe_device_info info;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_device);
+
+        if (!gpe_device) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        if (index >= acpi_current_gpe_count) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Setup and walk the GPE list */
+
+        info.index = index;
+        info.status = AE_NOT_EXIST;
+        info.gpe_device = NULL;
+        info.next_block_base_index = 0;
+
+        status = acpi_ev_walk_gpe_list(acpi_ev_get_gpe_device, &info);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        *gpe_device = info.gpe_device;
+        return_ACPI_STATUS(info.status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_get_gpe_device
+ *
+ * PARAMETERS:  GPE_WALK_CALLBACK
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Matches the input GPE index (0-current_gpe_count) with a GPE
+ *              block device. NULL if the GPE is one of the FADT-defined GPEs.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context)
+{
+        struct acpi_gpe_device_info *info = context;
+
+        /* Increment Index by the number of GPEs in this block */
+
+        info->next_block_base_index +=
+            (gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH);
+
+        if (info->index < info->next_block_base_index) {
+                /*
+                 * The GPE index is within this block, get the node. Leave the node
+                 * NULL for the FADT-defined GPEs
+                 */
+                if ((gpe_block->node)->type == ACPI_TYPE_DEVICE) {
+                        info->gpe_device = gpe_block->node;
+                }
+
+                info->status = AE_OK;
+                return (AE_CTRL_END);
+        }
+
+        return (AE_OK);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_disable_all_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Disable and clear all GPEs in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_disable_all_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_disable_all_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_disable_all_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_all_runtime_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Enable all "runtime" GPEs, in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_enable_all_runtime_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_all_runtime_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_enable_all_runtime_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index e8750807e57d..479e7a3721be 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfregn")
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 74da6fa52ef1..932bbc26aa04 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -42,10 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/actables.h>
-#include <acpi/acdispat.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "actables.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exconfig")
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 1d1f35adddde..0be10188316e 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exconvrt")
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/acpica/excreate.c
index ad09696d5069..a57ad2564ab0 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/acpica/exdump.c
index d087a7d28aa5..aa313574b0df 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exdump")
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/acpica/exfield.c
index 3e440d84226a..a352d0233857 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acdispat.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exfield")
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 9ff9d1f4615d..ef58ac4e687b 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -42,10 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acevents.h>
-#include <acpi/acdispat.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acevents.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exfldio")
@@ -498,14 +499,13 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                         return_ACPI_STATUS(status);
                 }
 
-                ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
-                                  "I/O to Data Register: ValuePtr %p\n",
-                                  value));
-
                 if (read_write == ACPI_READ) {
 
                         /* Read the datum from the data_register */
 
+                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                                          "Read from Data Register\n"));
+
                         status =
                             acpi_ex_extract_from_field(obj_desc->index_field.
                                                        data_obj, value,
@@ -513,6 +513,10 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                 } else {
                         /* Write the datum to the data_register */
 
+                        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                                          "Write to Data Register: Value %8.8X%8.8X\n",
+                                          ACPI_FORMAT_UINT64(*value)));
+
                         status =
                             acpi_ex_insert_into_field(obj_desc->index_field.
                                                       data_obj, value,
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/acpica/exmisc.c
index efb191340059..6b0747ac683b 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/amlresrc.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmisc")
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/acpica/exmutex.c
index a8bf3d713e28..d301c1f363ef 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmutex")
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/acpica/exnames.c
index 817e67be3697..ffdae122d94a 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exnames")
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index f622f9eac8a1..b530480cc7d5 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -43,11 +43,12 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg1")
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 368def5dffce..0b4f513ca885 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -42,10 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acinterp.h>
-#include <acpi/acevents.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acinterp.h"
+#include "acevents.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg2")
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 9cb4197681af..c6520bbf882b 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "acparser.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg3")
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 67d48737af53..ae43f7670a6c 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "acparser.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg6")
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/acpica/exprep.c
index a7dc87ecee37..a226f74d4a5c 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exprep")
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/acpica/exregion.c
index 7a41c409ae4d..76ec8ff903b8 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exregion")
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 423ad3635f3d..a063a74006f6 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresnte")
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 60e8c47128e9..f6105a6d6126 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -43,10 +43,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresolv")
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/acpica/exresop.c
index 0bb82593da72..3c3802764bfb 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -43,10 +43,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acparser.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acparser.h"
+#include "acinterp.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresop")
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/acpica/exstore.c
index 1c118ba78adb..e35e9b4f6a4e 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -43,10 +43,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstore")
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/acpica/exstoren.c
index eef61a00803e..145d15305f70 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -44,8 +44,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstoren")
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/acpica/exstorob.c
index 9a75ff09fb0c..67340cc70142 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstorob")
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 68990f1df371..3d00b9357233 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exsystem")
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/acpica/exutils.c
index 86c03880b523..32b85d68e756 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -59,8 +59,9 @@
 #define DEFINE_AML_GLOBALS
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exutils")
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 816894ea839e..a9d4fea4167f 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -43,6 +43,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwacpi")
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 0b80db9d9197..2013b66745d2 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwgpe")
@@ -51,7 +52,8 @@ ACPI_MODULE_NAME("hwgpe")
 /* Local prototypes */
 static acpi_status
 acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                                struct acpi_gpe_block_info *gpe_block);
+                                struct acpi_gpe_block_info *gpe_block,
+                                void *context);
 
 /******************************************************************************
  *
@@ -80,8 +82,7 @@ acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         /* Get current value of the enable register that contains this GPE */
 
-        status = acpi_hw_low_level_read(ACPI_GPE_REGISTER_WIDTH, &enable_mask,
-                                        &gpe_register_info->enable_address);
+        status = acpi_read(&enable_mask, &gpe_register_info->enable_address);
         if (ACPI_FAILURE(status)) {
                 return (status);
         }
@@ -95,9 +96,7 @@ acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         /* Write the updated enable mask */
 
-        status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, enable_mask,
-                                         &gpe_register_info->enable_address);
-
+        status = acpi_write(enable_mask, &gpe_register_info->enable_address);
         return (status);
 }
 
@@ -132,8 +131,8 @@ acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info * gpe_event_info)
 
         /* Write the entire GPE (runtime) enable register */
 
-        status = acpi_hw_low_level_write(8, gpe_register_info->enable_for_run,
-                                         &gpe_register_info->enable_address);
+        status = acpi_write(gpe_register_info->enable_for_run,
+                            &gpe_register_info->enable_address);
 
         return (status);
 }
@@ -166,9 +165,8 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
          * Write a one to the appropriate bit in the status register to
          * clear this GPE.
          */
-        status = acpi_hw_low_level_write(8, register_bit,
-                                         &gpe_event_info->register_info->
-                                         status_address);
+        status = acpi_write(register_bit,
+                            &gpe_event_info->register_info->status_address);
 
         return (status);
 }
@@ -227,9 +225,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
 
         /* GPE currently active (status bit == 1)? */
 
-        status =
-            acpi_hw_low_level_read(8, &in_byte,
-                                   &gpe_register_info->status_address);
+        status = acpi_read(&in_byte, &gpe_register_info->status_address);
         if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
         }
@@ -260,8 +256,8 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
  ******************************************************************************/
 
 acpi_status
-acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
-                          struct acpi_gpe_block_info * gpe_block)
+acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                          struct acpi_gpe_block_info *gpe_block, void *context)
 {
         u32 i;
         acpi_status status;
@@ -272,9 +268,9 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
 
                 /* Disable all GPEs in this register */
 
-                status = acpi_hw_low_level_write(8, 0x00,
-                                                 &gpe_block->register_info[i].
-                                                 enable_address);
+                status =
+                    acpi_write(0x00,
+                               &gpe_block->register_info[i].enable_address);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
@@ -297,8 +293,8 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
  ******************************************************************************/
 
 acpi_status
-acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
-                        struct acpi_gpe_block_info * gpe_block)
+acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                        struct acpi_gpe_block_info *gpe_block, void *context)
 {
         u32 i;
         acpi_status status;
@@ -309,9 +305,9 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
 
                 /* Clear status on all GPEs in this register */
 
-                status = acpi_hw_low_level_write(8, 0xFF,
-                                                 &gpe_block->register_info[i].
-                                                 status_address);
+                status =
+                    acpi_write(0xFF,
+                               &gpe_block->register_info[i].status_address);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
@@ -335,8 +331,8 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
  ******************************************************************************/
 
 acpi_status
-acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
-                                 struct acpi_gpe_block_info * gpe_block)
+acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                                 struct acpi_gpe_block_info *gpe_block, void *context)
 {
         u32 i;
         acpi_status status;
@@ -352,12 +348,9 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
 
                 /* Enable all "runtime" GPEs in this register */
 
-                status =
-                    acpi_hw_low_level_write(8,
-                                            gpe_block->register_info[i].
-                                            enable_for_run,
-                                            &gpe_block->register_info[i].
-                                            enable_address);
+                status = acpi_write(gpe_block->register_info[i].enable_for_run,
+                                    &gpe_block->register_info[i].
+                                    enable_address);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
@@ -382,7 +375,8 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
 
 static acpi_status
 acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                                struct acpi_gpe_block_info *gpe_block)
+                                struct acpi_gpe_block_info *gpe_block,
+                                void *context)
 {
         u32 i;
         acpi_status status;
@@ -396,11 +390,9 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
                 /* Enable all "wake" GPEs in this register */
 
-                status = acpi_hw_low_level_write(8,
-                                                 gpe_block->register_info[i].
-                                                 enable_for_wake,
-                                                 &gpe_block->register_info[i].
-                                                 enable_address);
+                status = acpi_write(gpe_block->register_info[i].enable_for_wake,
+                                    &gpe_block->register_info[i].
+                                    enable_address);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
@@ -427,8 +419,8 @@ acpi_status acpi_hw_disable_all_gpes(void)
 
         ACPI_FUNCTION_TRACE(hw_disable_all_gpes);
 
-        status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block);
-        status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block);
+        status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL);
+        status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block, NULL);
         return_ACPI_STATUS(status);
 }
 
@@ -450,7 +442,7 @@ acpi_status acpi_hw_enable_all_runtime_gpes(void)
 
         ACPI_FUNCTION_TRACE(hw_enable_all_runtime_gpes);
 
-        status = acpi_ev_walk_gpe_list(acpi_hw_enable_runtime_gpe_block);
+        status = acpi_ev_walk_gpe_list(acpi_hw_enable_runtime_gpe_block, NULL);
         return_ACPI_STATUS(status);
 }
 
@@ -472,6 +464,6 @@ acpi_status acpi_hw_enable_all_wakeup_gpes(void)
 
         ACPI_FUNCTION_TRACE(hw_enable_all_wakeup_gpes);
 
-        status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block);
+        status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block, NULL);
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
new file mode 100644
index 000000000000..4dc43b018517
--- /dev/null
+++ b/drivers/acpi/acpica/hwregs.c
@@ -0,0 +1,353 @@
+
+/*******************************************************************************
+ *
+ * Module Name: hwregs - Read/write access functions for the various ACPI
+ *                       control and status registers.
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2008, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acevents.h"
+
+#define _COMPONENT          ACPI_HARDWARE
+ACPI_MODULE_NAME("hwregs")
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_clear_acpi_status
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Clears all fixed and general purpose status bits
+ *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
+ *
+ ******************************************************************************/
+acpi_status acpi_hw_clear_acpi_status(void)
+{
+        acpi_status status;
+        acpi_cpu_flags lock_flags = 0;
+
+        ACPI_FUNCTION_TRACE(hw_clear_acpi_status);
+
+        ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",
+                          ACPI_BITMASK_ALL_FIXED_STATUS,
+                          (u16) acpi_gbl_FADT.xpm1a_event_block.address));
+
+        lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
+
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
+                                        ACPI_BITMASK_ALL_FIXED_STATUS);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+
+        /* Clear the fixed events */
+
+        if (acpi_gbl_FADT.xpm1b_event_block.address) {
+                status = acpi_write(ACPI_BITMASK_ALL_FIXED_STATUS,
+                                    &acpi_gbl_FADT.xpm1b_event_block);
+                if (ACPI_FAILURE(status)) {
+                        goto unlock_and_exit;
+                }
+        }
+
+        /* Clear the GPE Bits in all GPE registers in all GPE blocks */
+
+        status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block, NULL);
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_get_register_bit_mask
+ *
+ * PARAMETERS:  register_id         - Index of ACPI Register to access
+ *
+ * RETURN:      The bitmask to be used when accessing the register
+ *
+ * DESCRIPTION: Map register_id into a register bitmask.
+ *
+ ******************************************************************************/
+
+struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
+{
+        ACPI_FUNCTION_ENTRY();
+
+        if (register_id > ACPI_BITREG_MAX) {
+                ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: %X",
+                            register_id));
+                return (NULL);
+        }
+
+        return (&acpi_gbl_bit_register_info[register_id]);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_register_read
+ *
+ * PARAMETERS:  register_id         - ACPI Register ID
+ *              return_value        - Where the register value is returned
+ *
+ * RETURN:      Status and the value read.
+ *
+ * DESCRIPTION: Read from the specified ACPI register
+ *
+ ******************************************************************************/
+acpi_status
+acpi_hw_register_read(u32 register_id, u32 * return_value)
+{
+        u32 value1 = 0;
+        u32 value2 = 0;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(hw_register_read);
+
+        switch (register_id) {
+        case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
+
+                status = acpi_read(&value1, &acpi_gbl_FADT.xpm1a_event_block);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* PM1B is optional */
+
+                status = acpi_read(&value2, &acpi_gbl_FADT.xpm1b_event_block);
+                value1 |= value2;
+                break;
+
+        case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
+
+                status = acpi_read(&value1, &acpi_gbl_xpm1a_enable);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* PM1B is optional */
+
+                status = acpi_read(&value2, &acpi_gbl_xpm1b_enable);
+                value1 |= value2;
+                break;
+
+        case ACPI_REGISTER_PM1_CONTROL: /* 16-bit access */
+
+                status = acpi_read(&value1, &acpi_gbl_FADT.xpm1a_control_block);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                status = acpi_read(&value2, &acpi_gbl_FADT.xpm1b_control_block);
+                value1 |= value2;
+                break;
+
+        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
+
+                status = acpi_read(&value1, &acpi_gbl_FADT.xpm2_control_block);
+                break;
+
+        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
+
+                status = acpi_read(&value1, &acpi_gbl_FADT.xpm_timer_block);
+                break;
+
+        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
+
+                status =
+                    acpi_os_read_port(acpi_gbl_FADT.smi_command, &value1, 8);
+                break;
+
+        default:
+                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
+                status = AE_BAD_PARAMETER;
+                break;
+        }
+
+      exit:
+
+        if (ACPI_SUCCESS(status)) {
+                *return_value = value1;
+        }
+
+        return_ACPI_STATUS(status);
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_hw_register_write
+ *
+ * PARAMETERS:  register_id         - ACPI Register ID
+ *              Value               - The value to write
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Write to the specified ACPI register
+ *
+ * NOTE: In accordance with the ACPI specification, this function automatically
+ * preserves the value of the following bits, meaning that these bits cannot be
+ * changed via this interface:
+ *
+ * PM1_CONTROL[0] = SCI_EN
+ * PM1_CONTROL[9]
+ * PM1_STATUS[11]
+ *
+ * ACPI References:
+ * 1) Hardware Ignored Bits: When software writes to a register with ignored
+ *      bit fields, it preserves the ignored bit fields
+ * 2) SCI_EN: OSPM always preserves this bit position
+ *
+ ******************************************************************************/
+
+acpi_status acpi_hw_register_write(u32 register_id, u32 value)
+{
+        acpi_status status;
+        u32 read_value;
+
+        ACPI_FUNCTION_TRACE(hw_register_write);
+
+        switch (register_id) {
+        case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
+
+                /* Perform a read first to preserve certain bits (per ACPI spec) */
+
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS,
+                                               &read_value);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* Insert the bits to be preserved */
+
+                ACPI_INSERT_BITS(value, ACPI_PM1_STATUS_PRESERVED_BITS,
+                                 read_value);
+
+                /* Now we can write the data */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1a_event_block);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* PM1B is optional */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1b_event_block);
+                break;
+
+        case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
+
+                status = acpi_write(value, &acpi_gbl_xpm1a_enable);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* PM1B is optional */
+
+                status = acpi_write(value, &acpi_gbl_xpm1b_enable);
+                break;
+
+        case ACPI_REGISTER_PM1_CONTROL: /* 16-bit access */
+
+                /*
+                 * Perform a read first to preserve certain bits (per ACPI spec)
+                 */
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
+                                               &read_value);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                /* Insert the bits to be preserved */
+
+                ACPI_INSERT_BITS(value, ACPI_PM1_CONTROL_PRESERVED_BITS,
+                                 read_value);
+
+                /* Now we can write the data */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1a_control_block);
+                if (ACPI_FAILURE(status)) {
+                        goto exit;
+                }
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1b_control_block);
+                break;
+
+        case ACPI_REGISTER_PM1A_CONTROL:        /* 16-bit access */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1a_control_block);
+                break;
+
+        case ACPI_REGISTER_PM1B_CONTROL:        /* 16-bit access */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm1b_control_block);
+                break;
+
+        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm2_control_block);
+                break;
+
+        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
+
+                status = acpi_write(value, &acpi_gbl_FADT.xpm_timer_block);
+                break;
+
+        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
+
+                /* SMI_CMD is currently always in IO space */
+
+                status =
+                    acpi_os_write_port(acpi_gbl_FADT.smi_command, value, 8);
+                break;
+
+        default:
+                status = AE_BAD_PARAMETER;
+                break;
+        }
+
+      exit:
+        return_ACPI_STATUS(status);
+}
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 25dccdf179b9..a2af2a4f2f26 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
@@ -52,31 +53,19 @@ ACPI_MODULE_NAME("hwsleep")
  *
  * FUNCTION:    acpi_set_firmware_waking_vector
  *
- * PARAMETERS:  physical_address    - Physical address of ACPI real mode
+ * PARAMETERS:  physical_address    - 32-bit physical address of ACPI real mode
  *                                    entry point.
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Access function for the firmware_waking_vector field in FACS
+ * DESCRIPTION: Sets the 32-bit firmware_waking_vector field of the FACS
  *
  ******************************************************************************/
 acpi_status
-acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
+acpi_set_firmware_waking_vector(u32 physical_address)
 {
-        struct acpi_table_facs *facs;
-        acpi_status status;
-
         ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
 
-        /* Get the 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);
-        }
 
         /*
          * According to the ACPI specification 2.0c and later, the 64-bit
@@ -85,10 +74,16 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
          * Protected Mode.  Some systems (for example HP dv5-1004nr) are known
          * to fail to resume if the 64-bit vector is used.
          */
-        if (facs->version >= 1)
-                facs->xfirmware_waking_vector = 0;
 
-        facs->firmware_waking_vector = (u32)physical_address;
+        /* Set the 32-bit vector */
+
+        acpi_gbl_FACS->firmware_waking_vector = physical_address;
+
+        /* Clear the 64-bit vector if it exists */
+
+        if ((acpi_gbl_FACS->length > 32) && (acpi_gbl_FACS->version >= 1)) {
+                acpi_gbl_FACS->xfirmware_waking_vector = 0;
+        }
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -97,48 +92,39 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_get_firmware_waking_vector
+ * FUNCTION:    acpi_set_firmware_waking_vector64
  *
- * PARAMETERS:  *physical_address   - Where the contents of
- *                                    the firmware_waking_vector field of
- *                                    the FACS will be returned.
+ * PARAMETERS:  physical_address    - 64-bit physical address of ACPI protected
+ *                                    mode entry point.
  *
- * RETURN:      Status, vector
+ * RETURN:      Status
  *
- * DESCRIPTION: Access function for the firmware_waking_vector field in FACS
+ * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
+ *              it exists in the table.
  *
  ******************************************************************************/
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
-acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
+acpi_set_firmware_waking_vector64(u64 physical_address)
 {
-        struct acpi_table_facs *facs;
-        acpi_status status;
+        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
 
-        ACPI_FUNCTION_TRACE(acpi_get_firmware_waking_vector);
-
-        if (!physical_address) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
 
-        /* Get the FACS */
+        /* Determine if the 64-bit vector actually exists */
 
-        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);
+        if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
-        /* Get the vector */
-        *physical_address = (acpi_physical_address)facs->firmware_waking_vector;
+        /* Clear 32-bit vector, set the 64-bit X_ vector */
+
+        acpi_gbl_FACS->firmware_waking_vector = 0;
+        acpi_gbl_FACS->xfirmware_waking_vector = physical_address;
 
         return_ACPI_STATUS(AE_OK);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_get_firmware_waking_vector)
-#endif
+ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enter_sleep_state_prep
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index b53d575491b9..b7f522c8f023 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -43,6 +43,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwtimer")
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/acpica/hwxface.c
index ddf792adcf96..ae597c0ab53f 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -1,10 +1,9 @@
 
-/*******************************************************************************
+/******************************************************************************
  *
- * Module Name: hwregs - Read/write access functions for the various ACPI
- *                       control and status registers.
+ * Module Name: hwxface - Public ACPICA hardware interfaces
  *
- ******************************************************************************/
+ *****************************************************************************/
 
 /*
  * Copyright (C) 2000 - 2008, Intel Corp.
@@ -44,209 +43,208 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_HARDWARE
-ACPI_MODULE_NAME("hwregs")
+ACPI_MODULE_NAME("hwxface")
 
-/*******************************************************************************
+/******************************************************************************
  *
- * FUNCTION:    acpi_hw_clear_acpi_status
+ * FUNCTION:    acpi_reset
  *
  * PARAMETERS:  None
  *
- * RETURN:      None
+ * RETURN:      Status
  *
- * DESCRIPTION: Clears all fixed and general purpose status bits
- *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
+ * DESCRIPTION: Set reset register in memory or IO space. Note: Does not
+ *              support reset register in PCI config space, this must be
+ *              handled separately.
  *
  ******************************************************************************/
-acpi_status acpi_hw_clear_acpi_status(void)
+acpi_status acpi_reset(void)
 {
+        struct acpi_generic_address *reset_reg;
         acpi_status status;
-        acpi_cpu_flags lock_flags = 0;
 
-        ACPI_FUNCTION_TRACE(hw_clear_acpi_status);
+        ACPI_FUNCTION_TRACE(acpi_reset);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",
-                          ACPI_BITMASK_ALL_FIXED_STATUS,
-                          (u16) acpi_gbl_FADT.xpm1a_event_block.address));
+        reset_reg = &acpi_gbl_FADT.reset_register;
 
-        lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
+        /* Check if the reset register is supported */
 
-        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
-                                        ACPI_BITMASK_ALL_FIXED_STATUS);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
+        if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
+            !reset_reg->address) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
-        /* Clear the fixed events */
-
-        if (acpi_gbl_FADT.xpm1b_event_block.address) {
-                status =
-                    acpi_hw_low_level_write(16, ACPI_BITMASK_ALL_FIXED_STATUS,
-                                            &acpi_gbl_FADT.xpm1b_event_block);
-                if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
-                }
-        }
-
-        /* Clear the GPE Bits in all GPE registers in all GPE blocks */
-
-        status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block);
+        /* Write the reset value to the reset register */
 
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
+        status = acpi_write(acpi_gbl_FADT.reset_value, reset_reg);
         return_ACPI_STATUS(status);
 }
 
-/*******************************************************************************
+ACPI_EXPORT_SYMBOL(acpi_reset)
+
+/******************************************************************************
  *
- * FUNCTION:    acpi_get_sleep_type_data
+ * FUNCTION:    acpi_read
  *
- * PARAMETERS:  sleep_state         - Numeric sleep state
- *              *sleep_type_a        - Where SLP_TYPa is returned
- *              *sleep_type_b        - Where SLP_TYPb is returned
+ * PARAMETERS:  Value               - Where the value is returned
+ *              Reg                 - GAS register structure
  *
- * RETURN:      Status - ACPI status
+ * RETURN:      Status
  *
- * DESCRIPTION: Obtain the SLP_TYPa and SLP_TYPb values for the requested sleep
- *              state.
+ * DESCRIPTION: Read from either memory or IO space.
  *
  ******************************************************************************/
-
-acpi_status
-acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
+acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg)
 {
-        acpi_status status = AE_OK;
-        struct acpi_evaluate_info *info;
-
-        ACPI_FUNCTION_TRACE(acpi_get_sleep_type_data);
-
-        /* Validate parameters */
-
-        if ((sleep_state > ACPI_S_STATES_MAX) || !sleep_type_a || !sleep_type_b) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
+        u32 width;
+        u64 address;
+        acpi_status status;
 
-        /* Allocate the evaluation information block */
+        ACPI_FUNCTION_NAME(acpi_read);
 
-        info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
-        if (!info) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
+        /*
+         * Must have a valid pointer to a GAS structure, and
+         * a non-zero address within. However, don't return an error
+         * because the PM1A/B code must not fail if B isn't present.
+         */
+        if (!reg) {
+                return (AE_OK);
         }
 
-        info->pathname =
-            ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);
-
-        /* Evaluate the namespace object containing the values for this state */
-
-        status = acpi_ns_evaluate(info);
-        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "%s while evaluating SleepState [%s]\n",
-                                  acpi_format_exception(status),
-                                  info->pathname));
+        /* Get a local copy of the address. Handles possible alignment issues */
 
-                goto cleanup;
+        ACPI_MOVE_64_TO_64(&address, &reg->address);
+        if (!address) {
+                return (AE_OK);
         }
 
-        /* Must have a return object */
+        /* Supported widths are 8/16/32 */
 
-        if (!info->return_object) {
-                ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
-                            info->pathname));
-                status = AE_NOT_EXIST;
+        width = reg->bit_width;
+        if ((width != 8) && (width != 16) && (width != 32)) {
+                return (AE_SUPPORT);
         }
 
-        /* It must be of type Package */
+        /* Initialize entire 32-bit return value to zero */
 
-        else if (ACPI_GET_OBJECT_TYPE(info->return_object) != ACPI_TYPE_PACKAGE) {
-                ACPI_ERROR((AE_INFO,
-                            "Sleep State return object is not a Package"));
-                status = AE_AML_OPERAND_TYPE;
-        }
+        *value = 0;
 
         /*
-         * The package must have at least two elements. NOTE (March 2005): This
-         * goes against the current ACPI spec which defines this object as a
-         * package with one encoded DWORD element. However, existing practice
-         * by BIOS vendors seems to be to have 2 or more elements, at least
-         * one per sleep type (A/B).
+         * Two address spaces supported: Memory or IO.
+         * PCI_Config is not supported here because the GAS struct is insufficient
          */
-        else if (info->return_object->package.count < 2) {
-                ACPI_ERROR((AE_INFO,
-                            "Sleep State return package does not have at least two elements"));
-                status = AE_AML_NO_OPERAND;
-        }
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
-        /* The first two elements must both be of type Integer */
+                status = acpi_os_read_memory((acpi_physical_address) address,
+                                             value, width);
+                break;
 
-        else if ((ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[0])
-                  != ACPI_TYPE_INTEGER) ||
-                 (ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[1])
-                  != ACPI_TYPE_INTEGER)) {
-                ACPI_ERROR((AE_INFO,
-                            "Sleep State return package elements are not both Integers (%s, %s)",
-                            acpi_ut_get_object_type_name(info->return_object->
-                                                         package.elements[0]),
-                            acpi_ut_get_object_type_name(info->return_object->
-                                                         package.elements[1])));
-                status = AE_AML_OPERAND_TYPE;
-        } else {
-                /* Valid _Sx_ package size, type, and value */
+        case ACPI_ADR_SPACE_SYSTEM_IO:
 
-                *sleep_type_a = (u8)
-                    (info->return_object->package.elements[0])->integer.value;
-                *sleep_type_b = (u8)
-                    (info->return_object->package.elements[1])->integer.value;
-        }
+                status =
+                    acpi_os_read_port((acpi_io_address) address, value, width);
+                break;
 
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "While evaluating SleepState [%s], bad Sleep object %p type %s",
-                                info->pathname, info->return_object,
-                                acpi_ut_get_object_type_name(info->
-                                                             return_object)));
+        default:
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X", reg->space_id));
+                return (AE_BAD_PARAMETER);
         }
 
-        acpi_ut_remove_reference(info->return_object);
+        ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                          "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
+                          *value, width, ACPI_FORMAT_UINT64(address),
+                          acpi_ut_get_region_name(reg->space_id)));
 
-      cleanup:
-        ACPI_FREE(info);
-        return_ACPI_STATUS(status);
+        return (status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_get_sleep_type_data)
+ACPI_EXPORT_SYMBOL(acpi_read)
 
-/*******************************************************************************
+/******************************************************************************
  *
- * FUNCTION:    acpi_hw_get_register_bit_mask
+ * FUNCTION:    acpi_write
  *
- * PARAMETERS:  register_id         - Index of ACPI Register to access
+ * PARAMETERS:  Value               - To be written
+ *              Reg                 - GAS register structure
  *
- * RETURN:      The bitmask to be used when accessing the register
+ * RETURN:      Status
  *
- * DESCRIPTION: Map register_id into a register bitmask.
+ * DESCRIPTION: Write to either memory or IO space.
  *
  ******************************************************************************/
-struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
+acpi_status acpi_write(u32 value, struct acpi_generic_address *reg)
 {
-        ACPI_FUNCTION_ENTRY();
+        u32 width;
+        u64 address;
+        acpi_status status;
 
-        if (register_id > ACPI_BITREG_MAX) {
-                ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: %X",
-                            register_id));
-                return (NULL);
+        ACPI_FUNCTION_NAME(acpi_write);
+
+        /*
+         * Must have a valid pointer to a GAS structure, and
+         * a non-zero address within. However, don't return an error
+         * because the PM1A/B code must not fail if B isn't present.
+         */
+        if (!reg) {
+                return (AE_OK);
         }
 
-        return (&acpi_gbl_bit_register_info[register_id]);
+        /* Get a local copy of the address. Handles possible alignment issues */
+
+        ACPI_MOVE_64_TO_64(&address, &reg->address);
+        if (!address) {
+                return (AE_OK);
+        }
+
+        /* Supported widths are 8/16/32 */
+
+        width = reg->bit_width;
+        if ((width != 8) && (width != 16) && (width != 32)) {
+                return (AE_SUPPORT);
+        }
+
+        /*
+         * Two address spaces supported: Memory or IO.
+         * PCI_Config is not supported here because the GAS struct is insufficient
+         */
+        switch (reg->space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+
+                status = acpi_os_write_memory((acpi_physical_address) address,
+                                              value, width);
+                break;
+
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+
+                status = acpi_os_write_port((acpi_io_address) address, value,
+                                            width);
+                break;
+
+        default:
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X", reg->space_id));
+                return (AE_BAD_PARAMETER);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                          "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
+                          value, width, ACPI_FORMAT_UINT64(address),
+                          acpi_ut_get_region_name(reg->space_id)));
+
+        return (status);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_write)
+
 /*******************************************************************************
  *
- * FUNCTION:    acpi_get_register
+ * FUNCTION:    acpi_get_register_unlocked
  *
  * PARAMETERS:  register_id     - ID of ACPI bit_register to access
  *              return_value    - Value that was read from the register
@@ -254,17 +252,16 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
  * RETURN:      Status and the value read from specified Register. Value
  *              returned is normalized to bit0 (is shifted all the way right)
  *
- * DESCRIPTION: ACPI bit_register read function.
+ * DESCRIPTION: ACPI bit_register read function. Does not acquire the HW lock.
  *
  ******************************************************************************/
-
-acpi_status acpi_get_register_unlocked(u32 register_id, u32 * return_value)
+acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value)
 {
         u32 register_value = 0;
         struct acpi_bit_register_info *bit_reg_info;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE(acpi_get_register);
+        ACPI_FUNCTION_TRACE(acpi_get_register_unlocked);
 
         /* Get the info structure corresponding to the requested ACPI Register */
 
@@ -296,14 +293,31 @@ acpi_status acpi_get_register_unlocked(u32 register_id, u32 * return_value)
         return_ACPI_STATUS(status);
 }
 
-acpi_status acpi_get_register(u32 register_id, u32 * return_value)
+ACPI_EXPORT_SYMBOL(acpi_get_register_unlocked)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_register
+ *
+ * PARAMETERS:  register_id     - ID of ACPI bit_register to access
+ *              return_value    - Value that was read from the register
+ *
+ * RETURN:      Status and the value read from specified Register. Value
+ *              returned is normalized to bit0 (is shifted all the way right)
+ *
+ * DESCRIPTION: ACPI bit_register read function.
+ *
+ ******************************************************************************/
+acpi_status acpi_get_register(u32 register_id, u32 *return_value)
 {
         acpi_status status;
         acpi_cpu_flags flags;
+
         flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
         status = acpi_get_register_unlocked(register_id, return_value);
         acpi_os_release_lock(acpi_gbl_hardware_lock, flags);
-        return status;
+
+        return (status);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_register)
@@ -370,8 +384,9 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
                                                    bit_reg_info->
                                                    access_bit_mask);
                 if (value) {
-                        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
-                                                        (u16) value);
+                        status =
+                            acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
+                                                   (u16) value);
                         register_value = 0;
                 }
                 break;
@@ -459,399 +474,120 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
 
 ACPI_EXPORT_SYMBOL(acpi_set_register)
 
-/******************************************************************************
+/*******************************************************************************
  *
- * FUNCTION:    acpi_hw_register_read
+ * FUNCTION:    acpi_get_sleep_type_data
  *
- * PARAMETERS:  register_id         - ACPI Register ID
- *              return_value        - Where the register value is returned
+ * PARAMETERS:  sleep_state         - Numeric sleep state
+ *              *sleep_type_a        - Where SLP_TYPa is returned
+ *              *sleep_type_b        - Where SLP_TYPb is returned
  *
- * RETURN:      Status and the value read.
+ * RETURN:      Status - ACPI status
  *
- * DESCRIPTION: Read from the specified ACPI register
+ * DESCRIPTION: Obtain the SLP_TYPa and SLP_TYPb values for the requested sleep
+ *              state.
  *
  ******************************************************************************/
 acpi_status
-acpi_hw_register_read(u32 register_id, u32 * return_value)
+acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b)
 {
-        u32 value1 = 0;
-        u32 value2 = 0;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(hw_register_read);
-
-        switch (register_id) {
-        case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT.xpm1a_event_block);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* PM1B is optional */
-
-                status =
-                    acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT.xpm1b_event_block);
-                value1 |= value2;
-                break;
-
-        case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_read(16, &value1, &acpi_gbl_xpm1a_enable);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* PM1B is optional */
-
-                status =
-                    acpi_hw_low_level_read(16, &value2, &acpi_gbl_xpm1b_enable);
-                value1 |= value2;
-                break;
-
-        case ACPI_REGISTER_PM1_CONTROL: /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT.xpm1a_control_block);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                status =
-                    acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT.xpm1b_control_block);
-                value1 |= value2;
-                break;
-
-        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
-
-                status =
-                    acpi_hw_low_level_read(8, &value1,
-                                           &acpi_gbl_FADT.xpm2_control_block);
-                break;
-
-        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
-
-                status =
-                    acpi_hw_low_level_read(32, &value1,
-                                           &acpi_gbl_FADT.xpm_timer_block);
-                break;
+        acpi_status status = AE_OK;
+        struct acpi_evaluate_info *info;
 
-        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
+        ACPI_FUNCTION_TRACE(acpi_get_sleep_type_data);
 
-                status =
-                    acpi_os_read_port(acpi_gbl_FADT.smi_command, &value1, 8);
-                break;
+        /* Validate parameters */
 
-        default:
-                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
-                status = AE_BAD_PARAMETER;
-                break;
+        if ((sleep_state > ACPI_S_STATES_MAX) || !sleep_type_a || !sleep_type_b) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-      exit:
+        /* Allocate the evaluation information block */
 
-        if (ACPI_SUCCESS(status)) {
-                *return_value = value1;
+        info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
+        if (!info) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_hw_register_write
- *
- * PARAMETERS:  register_id         - ACPI Register ID
- *              Value               - The value to write
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Write to the specified ACPI register
- *
- * NOTE: In accordance with the ACPI specification, this function automatically
- * preserves the value of the following bits, meaning that these bits cannot be
- * changed via this interface:
- *
- * PM1_CONTROL[0] = SCI_EN
- * PM1_CONTROL[9]
- * PM1_STATUS[11]
- *
- * ACPI References:
- * 1) Hardware Ignored Bits: When software writes to a register with ignored
- *      bit fields, it preserves the ignored bit fields
- * 2) SCI_EN: OSPM always preserves this bit position
- *
- ******************************************************************************/
-
-acpi_status acpi_hw_register_write(u32 register_id, u32 value)
-{
-        acpi_status status;
-        u32 read_value;
-
-        ACPI_FUNCTION_TRACE(hw_register_write);
-
-        switch (register_id) {
-        case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
-
-                /* Perform a read first to preserve certain bits (per ACPI spec) */
-
-                status = acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS,
-                                               &read_value);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* Insert the bits to be preserved */
-
-                ACPI_INSERT_BITS(value, ACPI_PM1_STATUS_PRESERVED_BITS,
-                                 read_value);
-
-                /* Now we can write the data */
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1a_event_block);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* PM1B is optional */
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1b_event_block);
-                break;
-
-        case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_write(16, value, &acpi_gbl_xpm1a_enable);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* PM1B is optional */
-
-                status =
-                    acpi_hw_low_level_write(16, value, &acpi_gbl_xpm1b_enable);
-                break;
-
-        case ACPI_REGISTER_PM1_CONTROL: /* 16-bit access */
-
-                /*
-                 * Perform a read first to preserve certain bits (per ACPI spec)
-                 */
-                status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
-                                               &read_value);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                /* Insert the bits to be preserved */
-
-                ACPI_INSERT_BITS(value, ACPI_PM1_CONTROL_PRESERVED_BITS,
-                                 read_value);
-
-                /* Now we can write the data */
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1a_control_block);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1b_control_block);
-                break;
-
-        case ACPI_REGISTER_PM1A_CONTROL:        /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1a_control_block);
-                break;
-
-        case ACPI_REGISTER_PM1B_CONTROL:        /* 16-bit access */
-
-                status =
-                    acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT.xpm1b_control_block);
-                break;
-
-        case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
-
-                status =
-                    acpi_hw_low_level_write(8, value,
-                                            &acpi_gbl_FADT.xpm2_control_block);
-                break;
-
-        case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
-
-                status =
-                    acpi_hw_low_level_write(32, value,
-                                            &acpi_gbl_FADT.xpm_timer_block);
-                break;
-
-        case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
+        info->pathname =
+            ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);
 
-                /* SMI_CMD is currently always in IO space */
+        /* Evaluate the namespace object containing the values for this state */
 
-                status =
-                    acpi_os_write_port(acpi_gbl_FADT.smi_command, value, 8);
-                break;
+        status = acpi_ns_evaluate(info);
+        if (ACPI_FAILURE(status)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "%s while evaluating SleepState [%s]\n",
+                                  acpi_format_exception(status),
+                                  info->pathname));
 
-        default:
-                status = AE_BAD_PARAMETER;
-                break;
+                goto cleanup;
         }
 
-      exit:
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_hw_low_level_read
- *
- * PARAMETERS:  Width               - 8, 16, or 32
- *              Value               - Where the value is returned
- *              Reg                 - GAS register structure
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Read from either memory or IO space.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
-{
-        u64 address;
-        acpi_status status;
-
-        ACPI_FUNCTION_NAME(hw_low_level_read);
+        /* Must have a return object */
 
-        /*
-         * Must have a valid pointer to a GAS structure, and
-         * a non-zero address within. However, don't return an error
-         * because the PM1A/B code must not fail if B isn't present.
-         */
-        if (!reg) {
-                return (AE_OK);
+        if (!info->return_object) {
+                ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
+                            info->pathname));
+                status = AE_NOT_EXIST;
         }
 
-        /* Get a local copy of the address. Handles possible alignment issues */
+        /* It must be of type Package */
 
-        ACPI_MOVE_64_TO_64(&address, &reg->address);
-        if (!address) {
-                return (AE_OK);
+        else if (ACPI_GET_OBJECT_TYPE(info->return_object) != ACPI_TYPE_PACKAGE) {
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return object is not a Package"));
+                status = AE_AML_OPERAND_TYPE;
         }
-        *value = 0;
 
         /*
-         * Two address spaces supported: Memory or IO.
-         * PCI_Config is not supported here because the GAS struct is insufficient
+         * The package must have at least two elements. NOTE (March 2005): This
+         * goes against the current ACPI spec which defines this object as a
+         * package with one encoded DWORD element. However, existing practice
+         * by BIOS vendors seems to be to have 2 or more elements, at least
+         * one per sleep type (A/B).
          */
-        switch (reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-
-                status = acpi_os_read_memory((acpi_physical_address) address,
-                                             value, width);
-                break;
-
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-
-                status =
-                    acpi_os_read_port((acpi_io_address) address, value, width);
-                break;
-
-        default:
+        else if (info->return_object->package.count < 2) {
                 ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X", reg->space_id));
-                return (AE_BAD_PARAMETER);
+                            "Sleep State return package does not have at least two elements"));
+                status = AE_AML_NO_OPERAND;
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_IO,
-                          "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
-                          *value, width, ACPI_FORMAT_UINT64(address),
-                          acpi_ut_get_region_name(reg->space_id)));
-
-        return (status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_hw_low_level_write
- *
- * PARAMETERS:  Width               - 8, 16, or 32
- *              Value               - To be written
- *              Reg                 - GAS register structure
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Write to either memory or IO space.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
-{
-        u64 address;
-        acpi_status status;
-
-        ACPI_FUNCTION_NAME(hw_low_level_write);
-
-        /*
-         * Must have a valid pointer to a GAS structure, and
-         * a non-zero address within. However, don't return an error
-         * because the PM1A/B code must not fail if B isn't present.
-         */
-        if (!reg) {
-                return (AE_OK);
-        }
+        /* The first two elements must both be of type Integer */
 
-        /* Get a local copy of the address. Handles possible alignment issues */
+        else if ((ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[0])
+                  != ACPI_TYPE_INTEGER) ||
+                 (ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[1])
+                  != ACPI_TYPE_INTEGER)) {
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return package elements are not both Integers (%s, %s)",
+                            acpi_ut_get_object_type_name(info->return_object->
+                                                         package.elements[0]),
+                            acpi_ut_get_object_type_name(info->return_object->
+                                                         package.elements[1])));
+                status = AE_AML_OPERAND_TYPE;
+        } else {
+                /* Valid _Sx_ package size, type, and value */
 
-        ACPI_MOVE_64_TO_64(&address, &reg->address);
-        if (!address) {
-                return (AE_OK);
+                *sleep_type_a = (u8)
+                    (info->return_object->package.elements[0])->integer.value;
+                *sleep_type_b = (u8)
+                    (info->return_object->package.elements[1])->integer.value;
         }
 
-        /*
-         * Two address spaces supported: Memory or IO.
-         * PCI_Config is not supported here because the GAS struct is insufficient
-         */
-        switch (reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-
-                status = acpi_os_write_memory((acpi_physical_address) address,
-                                              value, width);
-                break;
-
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-
-                status = acpi_os_write_port((acpi_io_address) address, value,
-                                            width);
-                break;
-
-        default:
-                ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X", reg->space_id));
-                return (AE_BAD_PARAMETER);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While evaluating SleepState [%s], bad Sleep object %p type %s",
+                                info->pathname, info->return_object,
+                                acpi_ut_get_object_type_name(info->
+                                                             return_object)));
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_IO,
-                          "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                          value, width, ACPI_FORMAT_UINT64(address),
-                          acpi_ut_get_region_name(reg->space_id)));
+        acpi_ut_remove_reference(info->return_object);
 
-        return (status);
+      cleanup:
+        ACPI_FREE(info);
+        return_ACPI_STATUS(status);
 }
+
+ACPI_EXPORT_SYMBOL(acpi_get_sleep_type_data)
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index c39a7f68b889..88303ebe924c 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acnamesp.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsaccess")
@@ -165,12 +166,9 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 obj_desc->method.method_flags =
                                     AML_METHOD_INTERNAL_ONLY;
-
-#ifndef ACPI_DUMP_APP
                                 obj_desc->method.implementation =
                                     acpi_ut_osi_implementation;
 #endif
-#endif
                                 break;
 
                         case ACPI_TYPE_INTEGER:
@@ -521,11 +519,11 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
         }
 
         /*
-         * Search namespace for each segment of the name.  Loop through and
+         * Search namespace for each segment of the name. Loop through and
          * verify (or add to the namespace) each name segment.
          *
          * The object type is significant only at the last name
-         * segment.  (We don't care about the types along the path, only
+         * segment. (We don't care about the types along the path, only
          * the type of the final target object.)
          */
         this_search_type = ACPI_TYPE_ANY;
@@ -591,6 +589,10 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                          * segments).
                          */
                         if (this_node->type == ACPI_TYPE_LOCAL_ALIAS) {
+                                if (!this_node->object) {
+                                        return_ACPI_STATUS(AE_NOT_EXIST);
+                                }
+
                                 if (acpi_ns_opens_scope
                                     (((struct acpi_namespace_node *)this_node->
                                       object)->type)) {
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 3a1740ac2edc..f976d848fe82 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsalloc")
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/acpica/nsdump.c
index cc0ae39440e4..0da33c8e9ba2 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsdump")
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 428f50fde11a..41994fe7fbb8 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 /* TBD: This entire module is apparently obsolete and should be removed */
 
@@ -49,7 +50,7 @@
 ACPI_MODULE_NAME("nsdumpdv")
 #ifdef ACPI_OBSOLETE_FUNCTIONS
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_dump_one_device
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/acpica/nseval.c
index 4cdf03ac2b46..0f3d5f9b5966 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acinterp.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nseval")
@@ -89,6 +90,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
         /* Initialize the return value to an invalid object */
 
         info->return_object = NULL;
+        info->param_count = 0;
 
         /*
          * Get the actual namespace node for the target object. Handles these cases:
@@ -141,41 +143,17 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
                         return_ACPI_STATUS(AE_NULL_OBJECT);
                 }
 
-                /*
-                 * Calculate the number of arguments being passed to the method
-                 */
+                /* Count the number of arguments being passed to the method */
 
-                info->param_count = 0;
                 if (info->parameters) {
-                        while (info->parameters[info->param_count])
+                        while (info->parameters[info->param_count]) {
+                                if (info->param_count > ACPI_METHOD_MAX_ARG) {
+                                        return_ACPI_STATUS(AE_LIMIT);
+                                }
                                 info->param_count++;
+                        }
                 }
 
-                /*
-                 * Warning if too few or too many arguments have been passed by the
-                 * caller. We don't want to abort here with an error because an
-                 * incorrect number of arguments may not cause the method to fail.
-                 * However, the method will fail if there are too few arguments passed
-                 * and the method attempts to use one of the missing ones.
-                 */
-
-                if (info->param_count < info->obj_desc->method.param_count) {
-                        ACPI_WARNING((AE_INFO,
-                                    "Insufficient arguments - "
-                                    "method [%4.4s] needs %d, found %d",
-                                    acpi_ut_get_node_name(info->resolved_node),
-                                    info->obj_desc->method.param_count,
-                                    info->param_count));
-                } else if (info->param_count >
-                                info->obj_desc->method.param_count) {
-                        ACPI_WARNING((AE_INFO,
-                                      "Excess arguments - "
-                                      "method [%4.4s] needs %d, found %d",
-                                      acpi_ut_get_node_name(info->
-                                                            resolved_node),
-                                      info->obj_desc->method.param_count,
-                                      info->param_count));
-                }
 
                 ACPI_DUMP_PATHNAME(info->resolved_node, "Execute Method:",
                                    ACPI_LV_INFO, _COMPONENT);
@@ -264,32 +242,13 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
                 }
         }
 
-        /* Validation of return values for ACPI-predefined methods and objects */
-
-        if ((status == AE_OK) || (status == AE_CTRL_RETURN_VALUE)) {
-                /*
-                 * If this is the first evaluation, check the return value. This
-                 * ensures that any warnings will only be emitted during the very
-                 * first evaluation of the object.
-                 */
-                if (!(node->flags & ANOBJ_EVALUATED)) {
-                        /*
-                         * Check for a predefined ACPI name. If found, validate the
-                         * returned object.
-                         *
-                         * Note: Ignore return status for now, emit warnings if there are
-                         * problems with the returned object. May change later to abort
-                         * the method on invalid return object.
-                         */
-                        (void)acpi_ns_check_predefined_names(node,
-                                                             info->
-                                                             return_object);
-                }
-
-                /* Mark the node as having been evaluated */
-
-                node->flags |= ANOBJ_EVALUATED;
-        }
+        /*
+         * Check input argument count against the ASL-defined count for a method.
+         * Also check predefined names: argument count and return value against
+         * the ACPI specification. Some incorrect return value types are repaired.
+         */
+        (void)acpi_ns_check_predefined_names(node, info->param_count,
+                status, &info->return_object);
 
         /* Check if there is a return value that must be dealt with */
 
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/acpica/nsinit.c
index e4c57510d798..13501cb81863 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acdispat.h"
+#include "acinterp.h"
 #include <linux/nmi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/acpica/nsload.c
index a4a412b7c029..a0ba9e12379e 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acdispat.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsload")
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 42a39a7c96e9..ae3dc10a7e81 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "amlcode.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsnames")
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 15fe09e24f71..08a97a57f8f9 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsobject")
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/acpica/nsparse.c
index a82271a9dbb3..b9e8d0070b6f 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -42,10 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
diff --git a/drivers/acpi/namespace/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 0f17cf0898c9..452703290d35 100644
--- a/drivers/acpi/namespace/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acpredef.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acpredef.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nspredef")
@@ -72,7 +73,7 @@ ACPI_MODULE_NAME("nspredef")
 /* Local prototypes */
 static acpi_status
 acpi_ns_check_package(char *pathname,
-                      union acpi_operand_object *return_object,
+                      union acpi_operand_object **return_object_ptr,
                       const union acpi_predefined_info *predefined);
 
 static acpi_status
@@ -82,13 +83,18 @@ acpi_ns_check_package_elements(char *pathname,
 
 static acpi_status
 acpi_ns_check_object_type(char *pathname,
-                          union acpi_operand_object *return_object,
+                          union acpi_operand_object **return_object_ptr,
                           u32 expected_btypes, u32 package_index);
 
 static acpi_status
 acpi_ns_check_reference(char *pathname,
                         union acpi_operand_object *return_object);
 
+static acpi_status
+acpi_ns_repair_object(u32 expected_btypes,
+                      u32 package_index,
+                      union acpi_operand_object **return_object_ptr);
+
 /*
  * Names for the types that can be returned by the predefined objects.
  * Used for warning messages. Must be in the same order as the ACPI_RTYPEs
@@ -108,8 +114,8 @@ static const char *acpi_rtype_names[] = {
  * FUNCTION:    acpi_ns_check_predefined_names
  *
  * PARAMETERS:  Node            - Namespace node for the method/object
- *              return_object   - Object returned from the evaluation of this
- *                                method/object
+ *              return_object_ptr - Pointer to the object returned from the
+ *                                evaluation of a method or object
  *
  * RETURN:      Status
  *
@@ -119,8 +125,11 @@ static const char *acpi_rtype_names[] = {
 
 acpi_status
 acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
-                               union acpi_operand_object *return_object)
+                               u32 user_param_count,
+                               acpi_status return_status,
+                               union acpi_operand_object **return_object_ptr)
 {
+        union acpi_operand_object *return_object = *return_object_ptr;
         acpi_status status = AE_OK;
         const union acpi_predefined_info *predefined;
         char *pathname;
@@ -128,12 +137,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
         /* Match the name for this method/object against the predefined list */
 
         predefined = acpi_ns_check_for_predefined_name(node);
-        if (!predefined) {
-
-                /* Name was not one of the predefined names */
-
-                return (AE_OK);
-        }
 
         /* Get the full pathname to the object, for use in error messages */
 
@@ -143,10 +146,37 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
         }
 
         /*
-         * Check that the parameter count for this method is in accordance
-         * with the ACPI specification.
+         * Check that the parameter count for this method matches the ASL
+         * definition. For predefined names, ensure that both the caller and
+         * the method itself are in accordance with the ACPI specification.
          */
-        acpi_ns_check_parameter_count(pathname, node, predefined);
+        acpi_ns_check_parameter_count(pathname, node, user_param_count,
+                                      predefined);
+
+        /* If not a predefined name, we cannot validate the return object */
+
+        if (!predefined) {
+                goto exit;
+        }
+
+        /* If the method failed, we cannot validate the return object */
+
+        if ((return_status != AE_OK) && (return_status != AE_CTRL_RETURN_VALUE)) {
+                goto exit;
+        }
+
+        /*
+         * Only validate the return value on the first successful evaluation of
+         * the method. This ensures that any warnings will only be emitted during
+         * the very first evaluation of the method/object.
+         */
+        if (node->flags & ANOBJ_EVALUATED) {
+                goto exit;
+        }
+
+        /* Mark the node as having been successfully evaluated */
+
+        node->flags |= ANOBJ_EVALUATED;
 
         /*
          * If there is no return value, check if we require a return value for
@@ -171,7 +201,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
          * We have a return value, but if one wasn't expected, just exit, this is
          * not a problem
          *
-         * For example, if "Implicit return value" is enabled, methods will
+         * For example, if the "Implicit Return" feature is enabled, methods will
          * always return a value
          */
         if (!predefined->info.expected_btypes) {
@@ -182,7 +212,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
          * Check that the type of the return object is what is expected for
          * this predefined name
          */
-        status = acpi_ns_check_object_type(pathname, return_object,
+        status = acpi_ns_check_object_type(pathname, return_object_ptr,
                                            predefined->info.expected_btypes,
                                            ACPI_NOT_PACKAGE);
         if (ACPI_FAILURE(status)) {
@@ -193,11 +223,12 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
 
         if (ACPI_GET_OBJECT_TYPE(return_object) == ACPI_TYPE_PACKAGE) {
                 status =
-                    acpi_ns_check_package(pathname, return_object, predefined);
+                    acpi_ns_check_package(pathname, return_object_ptr,
+                                          predefined);
         }
 
       exit:
-        if (pathname) {
+        if (pathname != predefined->info.name) {
                 ACPI_FREE(pathname);
         }
 
@@ -210,6 +241,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
  *
  * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
  *              Node            - Namespace node for the method/object
+ *              user_param_count - Number of args passed in by the caller
  *              Predefined      - Pointer to entry in predefined name table
  *
  * RETURN:      None
@@ -223,32 +255,76 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
 void
 acpi_ns_check_parameter_count(char *pathname,
                               struct acpi_namespace_node *node,
+                              u32 user_param_count,
                               const union acpi_predefined_info *predefined)
 {
         u32 param_count;
         u32 required_params_current;
         u32 required_params_old;
 
-        /*
-         * Check that the ASL-defined parameter count is what is expected for
-         * this predefined name.
-         *
-         * Methods have 0-7 parameters. All other types have zero.
-         */
+        /* Methods have 0-7 parameters. All other types have zero. */
+
         param_count = 0;
         if (node->type == ACPI_TYPE_METHOD) {
                 param_count = node->object->method.param_count;
         }
 
-        /* Validate parameter count - allow two different legal counts (_SCP) */
+        /* Argument count check for non-predefined methods/objects */
+
+        if (!predefined) {
+                /*
+                 * Warning if too few or too many arguments have been passed by the
+                 * caller. An incorrect number of arguments may not cause the method
+                 * to fail. However, the method will fail if there are too few
+                 * arguments and the method attempts to use one of the missing ones.
+                 */
+                if (user_param_count < param_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "%s: Insufficient arguments - needs %d, found %d",
+                                      pathname, param_count, user_param_count));
+                } else if (user_param_count > param_count) {
+                        ACPI_WARNING((AE_INFO,
+                                      "%s: Excess arguments - needs %d, found %d",
+                                      pathname, param_count, user_param_count));
+                }
+                return;
+        }
+
+        /* Allow two different legal argument counts (_SCP, etc.) */
 
         required_params_current = predefined->info.param_count & 0x0F;
         required_params_old = predefined->info.param_count >> 4;
 
+        if (user_param_count != ACPI_UINT32_MAX) {
+
+                /* Validate the user-supplied parameter count */
+
+                if ((user_param_count != required_params_current) &&
+                    (user_param_count != required_params_old)) {
+                        ACPI_WARNING((AE_INFO,
+                                      "%s: Parameter count mismatch - caller passed %d, ACPI requires %d",
+                                      pathname, user_param_count,
+                                      required_params_current));
+                }
+        }
+
+        /*
+         * Only validate the argument count on the first successful evaluation of
+         * the method. This ensures that any warnings will only be emitted during
+         * the very first evaluation of the method/object.
+         */
+        if (node->flags & ANOBJ_EVALUATED) {
+                return;
+        }
+
+        /*
+         * Check that the ASL-defined parameter count is what is expected for
+         * this predefined name.
+         */
         if ((param_count != required_params_current) &&
             (param_count != required_params_old)) {
                 ACPI_WARNING((AE_INFO,
-                              "%s: Parameter count mismatch - ASL declared %d, expected %d",
+                              "%s: Parameter count mismatch - ASL declared %d, ACPI requires %d",
                               pathname, param_count, required_params_current));
         }
 }
@@ -307,8 +383,8 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
  * FUNCTION:    acpi_ns_check_package
  *
  * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
- *              return_object   - Object returned from the evaluation of a
- *                                method or object
+ *              return_object_ptr - Pointer to the object returned from the
+ *                                evaluation of a method or object
  *              Predefined      - Pointer to entry in predefined name table
  *
  * RETURN:      Status
@@ -320,9 +396,10 @@ const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
 
 static acpi_status
 acpi_ns_check_package(char *pathname,
-                      union acpi_operand_object *return_object,
+                      union acpi_operand_object **return_object_ptr,
                       const union acpi_predefined_info *predefined)
 {
+        union acpi_operand_object *return_object = *return_object_ptr;
         const union acpi_predefined_info *package;
         union acpi_operand_object *sub_package;
         union acpi_operand_object **elements;
@@ -408,7 +485,7 @@ acpi_ns_check_package(char *pathname,
                  * elements must be of the same type
                  */
                 for (i = 0; i < count; i++) {
-                        status = acpi_ns_check_object_type(pathname, *elements,
+                        status = acpi_ns_check_object_type(pathname, elements,
                                                            package->ret_info.
                                                            object_type1, i);
                         if (ACPI_FAILURE(status)) {
@@ -441,7 +518,7 @@ acpi_ns_check_package(char *pathname,
 
                                 status =
                                     acpi_ns_check_object_type(pathname,
-                                                              *elements,
+                                                              elements,
                                                               package->
                                                               ret_info3.
                                                               object_type[i],
@@ -454,7 +531,7 @@ acpi_ns_check_package(char *pathname,
 
                                 status =
                                     acpi_ns_check_object_type(pathname,
-                                                              *elements,
+                                                              elements,
                                                               package->
                                                               ret_info3.
                                                               tail_object_type,
@@ -471,7 +548,7 @@ acpi_ns_check_package(char *pathname,
 
                 /* First element is the (Integer) count of sub-packages to follow */
 
-                status = acpi_ns_check_object_type(pathname, *elements,
+                status = acpi_ns_check_object_type(pathname, elements,
                                                    ACPI_RTYPE_INTEGER, 0);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -509,7 +586,7 @@ acpi_ns_check_package(char *pathname,
                         /* Each sub-object must be of type Package */
 
                         status =
-                            acpi_ns_check_object_type(pathname, sub_package,
+                            acpi_ns_check_object_type(pathname, &sub_package,
                                                       ACPI_RTYPE_PACKAGE, i);
                         if (ACPI_FAILURE(status)) {
                                 return (status);
@@ -567,12 +644,8 @@ acpi_ns_check_package(char *pathname,
                                 for (j = 0; j < expected_count; j++) {
                                         status =
                                             acpi_ns_check_object_type(pathname,
-                                                                      sub_elements
-                                                                      [j],
-                                                                      package->
-                                                                      ret_info2.
-                                                                      object_type
-                                                                      [j], j);
+                                                &sub_elements[j],
+                                                package->ret_info2.object_type[j], j);
                                         if (ACPI_FAILURE(status)) {
                                                 return (status);
                                         }
@@ -611,7 +684,7 @@ acpi_ns_check_package(char *pathname,
 
                                 status =
                                     acpi_ns_check_object_type(pathname,
-                                                              *sub_elements,
+                                                              sub_elements,
                                                               ACPI_RTYPE_INTEGER,
                                                               0);
                                 if (ACPI_FAILURE(status)) {
@@ -708,7 +781,7 @@ acpi_ns_check_package_elements(char *pathname,
          * The second group can have a count of zero.
          */
         for (i = 0; i < count1; i++) {
-                status = acpi_ns_check_object_type(pathname, *this_element,
+                status = acpi_ns_check_object_type(pathname, this_element,
                                                    type1, i);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -717,7 +790,7 @@ acpi_ns_check_package_elements(char *pathname,
         }
 
         for (i = 0; i < count2; i++) {
-                status = acpi_ns_check_object_type(pathname, *this_element,
+                status = acpi_ns_check_object_type(pathname, this_element,
                                                    type2, (i + count1));
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -733,8 +806,8 @@ acpi_ns_check_package_elements(char *pathname,
  * FUNCTION:    acpi_ns_check_object_type
  *
  * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
- *              return_object   - Object return from the execution of this
- *                                method/object
+ *              return_object_ptr - Pointer to the object returned from the
+ *                                evaluation of a method or object
  *              expected_btypes - Bitmap of expected return type(s)
  *              package_index   - Index of object within parent package (if
  *                                applicable - ACPI_NOT_PACKAGE otherwise)
@@ -748,9 +821,10 @@ acpi_ns_check_package_elements(char *pathname,
 
 static acpi_status
 acpi_ns_check_object_type(char *pathname,
-                          union acpi_operand_object *return_object,
+                          union acpi_operand_object **return_object_ptr,
                           u32 expected_btypes, u32 package_index)
 {
+        union acpi_operand_object *return_object = *return_object_ptr;
         acpi_status status = AE_OK;
         u32 return_btype;
         char type_buffer[48];   /* Room for 5 types */
@@ -814,6 +888,14 @@ acpi_ns_check_object_type(char *pathname,
         /* Is the object one of the expected types? */
 
         if (!(return_btype & expected_btypes)) {
+
+                /* Type mismatch -- attempt repair of the returned object */
+
+                status = acpi_ns_repair_object(expected_btypes, package_index,
+                                               return_object_ptr);
+                if (ACPI_SUCCESS(status)) {
+                        return (status);
+                }
                 goto type_error_exit;
         }
 
@@ -898,3 +980,86 @@ acpi_ns_check_reference(char *pathname,
 
         return (AE_AML_OPERAND_TYPE);
 }
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_repair_object
+ *
+ * PARAMETERS:  Pathname        - Full pathname to the node (for error msgs)
+ *              package_index   - Used to determine if target is in a package
+ *              return_object_ptr - Pointer to the object returned from the
+ *                                evaluation of a method or object
+ *
+ * RETURN:      Status. AE_OK if repair was successful.
+ *
+ * DESCRIPTION: Attempt to repair/convert a return object of a type that was
+ *              not expected.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ns_repair_object(u32 expected_btypes,
+                      u32 package_index,
+                      union acpi_operand_object **return_object_ptr)
+{
+        union acpi_operand_object *return_object = *return_object_ptr;
+        union acpi_operand_object *new_object;
+        acpi_size length;
+
+        switch (ACPI_GET_OBJECT_TYPE(return_object)) {
+        case ACPI_TYPE_BUFFER:
+
+                if (!(expected_btypes & ACPI_RTYPE_STRING)) {
+                        return (AE_AML_OPERAND_TYPE);
+                }
+
+                /*
+                 * Have a Buffer, expected a String, convert. Use a to_string
+                 * conversion, no transform performed on the buffer data. The best
+                 * example of this is the _BIF method, where the string data from
+                 * the battery is often (incorrectly) returned as buffer object(s).
+                 */
+                length = 0;
+                while ((length < return_object->buffer.length) &&
+                       (return_object->buffer.pointer[length])) {
+                        length++;
+                }
+
+                /* Allocate a new string object */
+
+                new_object = acpi_ut_create_string_object(length);
+                if (!new_object) {
+                        return (AE_NO_MEMORY);
+                }
+
+                /*
+                 * Copy the raw buffer data with no transform. String is already NULL
+                 * terminated at Length+1.
+                 */
+                ACPI_MEMCPY(new_object->string.pointer,
+                            return_object->buffer.pointer, length);
+
+                /* Install the new return object */
+
+                acpi_ut_remove_reference(return_object);
+                *return_object_ptr = new_object;
+
+                /*
+                 * If the object is a package element, we need to:
+                 * 1. Decrement the reference count of the orignal object, it was
+                 *    incremented when building the package
+                 * 2. Increment the reference count of the new object, it will be
+                 *    decremented when releasing the package
+                 */
+                if (package_index != ACPI_NOT_PACKAGE) {
+                        acpi_ut_remove_reference(return_object);
+                        acpi_ut_add_reference(new_object);
+                }
+                return (AE_OK);
+
+        default:
+                break;
+        }
+
+        return (AE_AML_OPERAND_TYPE);
+}
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/acpica/nssearch.c
index a9a80bf811b3..6fea13f3f52d 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nssearch")
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/acpica/nsutils.c
index b0817e1127b1..3e1149bf4aa5 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -43,9 +43,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/amlcode.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "amlcode.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsutils")
@@ -314,9 +315,15 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
          *
          * strlen() + 1 covers the first name_seg, which has no path separator
          */
-        if (acpi_ns_valid_root_prefix(next_external_char[0])) {
+        if (acpi_ns_valid_root_prefix(*next_external_char)) {
                 info->fully_qualified = TRUE;
                 next_external_char++;
+
+                /* Skip redundant root_prefix, like \\_SB.PCI0.SBRG.EC0 */
+
+                while (acpi_ns_valid_root_prefix(*next_external_char)) {
+                        next_external_char++;
+                }
         } else {
                 /*
                  * Handle Carat prefixes
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 3c905ce26d7d..200895fa2728 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nswalk")
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index a085cc39c055..22a7171ac1ed 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 5efa4e7ddb0b..9589fea24997 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfname")
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 2b375ee80cef..1c7efc15225f 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -43,7 +43,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfobj")
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/acpica/psargs.c
index d830b29b85b1..b161f3544b51 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -42,10 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
+#include "acnamesp.h"
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psargs")
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/acpica/psloop.c
index 4647039a0d8a..c5f6ce19a401 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -50,9 +50,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psloop")
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/acpica/psopcode.c
index f425ab30eae8..3bc3a60194d6 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acopcode.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acopcode.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psopcode")
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/acpica/psparse.c
index 68e932f215ea..70838e9b608c 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -51,11 +51,12 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "amlcode.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psparse")
@@ -447,10 +448,22 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                           walk_state, walk_state->parser_state.aml,
                           walk_state->parser_state.aml_size));
 
+        if (!walk_state->parser_state.aml) {
+                return_ACPI_STATUS(AE_NULL_OBJECT);
+        }
+
         /* Create and initialize a new thread state */
 
         thread = acpi_ut_create_thread_state();
         if (!thread) {
+                if (walk_state->method_desc) {
+
+                        /* Executing a control method - additional cleanup */
+
+                        acpi_ds_terminate_control_method(
+                                walk_state->method_desc, walk_state);
+                }
+
                 acpi_ds_delete_walk_state(walk_state);
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/acpica/psscope.c
index ee50e67c9443..2feca5ca9581 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
+#include "accommon.h"
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psscope")
diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/acpica/pstree.c
index 1dd355ddd182..4d3389118ec3 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("pstree")
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/acpica/psutils.c
index 7cf1f65cd5bb..e636e078ad3d 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/amlcode.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psutils")
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/acpica/pswalk.c
index 8b86ad5a3201..78b8b791f2ae 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
+#include "accommon.h"
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("pswalk")
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/acpica/psxface.c
index 270469aae842..ff06032c0f06 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -42,9 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acparser.h>
-#include <acpi/acdispat.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acparser.h"
+#include "acdispat.h"
+#include "acinterp.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psxface")
@@ -278,6 +280,38 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
+        /* Invoke an internal method if necessary */
+
+        if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
+                status = info->obj_desc->method.implementation(walk_state);
+                info->return_object = walk_state->return_desc;
+
+                /* Cleanup states */
+
+                acpi_ds_scope_stack_clear(walk_state);
+                acpi_ps_cleanup_scope(&walk_state->parser_state);
+                acpi_ds_terminate_control_method(walk_state->method_desc,
+                                                 walk_state);
+                acpi_ds_delete_walk_state(walk_state);
+                goto cleanup;
+        }
+
+        /*
+         * Start method evaluation with an implicit return of zero.
+         * This is done for Windows compatibility.
+         */
+        if (acpi_gbl_enable_interpreter_slack) {
+                walk_state->implicit_return_obj =
+                    acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
+                if (!walk_state->implicit_return_obj) {
+                        status = AE_NO_MEMORY;
+                        acpi_ds_delete_walk_state(walk_state);
+                        goto cleanup;
+                }
+
+                walk_state->implicit_return_obj->integer.value = 0;
+        }
+
         /* Parse the AML */
 
         status = acpi_ps_parse_aml(walk_state);
diff --git a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 7f96332822bf..1e437bfd8db5 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsaddr")
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 8eaaecf92009..52865ee6bc77 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acresrc.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rscalc")
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 08b8d73e6ee5..61566b1a0616 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acresrc.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rscreate")
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 6bbbb7b8941a..3f0ca5a12d34 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index 3f0a1fedbe0e..77b25fdb459c 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsinfo")
diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/acpica/rsio.c
index b66d42e7402e..35a49aa95609 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsio")
diff --git a/drivers/acpi/resources/rsirq.c b/drivers/acpi/acpica/rsirq.c
index a8805efc0366..2e0256983aa6 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsirq")
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/acpica/rslist.c
index b78c7e797a19..1b1dbc69f087 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rslist")
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 63b21abd90bb..ddc76cebdc92 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmemory")
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 96a6c0353255..5bc49a553284 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmisc")
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/acpica/rsutils.c
index f7b3bcd59ba7..bc03d5966829 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acresrc.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsutils")
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/acpica/rsxface.c
index f59f4c4e034c..69a2aa5b5d83 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acresrc.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsxface")
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 2817158fb6a1..3636e4f8fb73 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -42,15 +42,16 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbfadt")
 
 /* Local prototypes */
-static void inline
+static inline void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 byte_width, u64 address);
+                             u8 space_id, u8 byte_width, u64 address);
 
 static void acpi_tb_convert_fadt(void);
 
@@ -60,9 +61,10 @@ static void acpi_tb_validate_fadt(void);
 
 typedef struct acpi_fadt_info {
         char *name;
-        u8 target;
-        u8 source;
+        u8 address64;
+        u8 address32;
         u8 length;
+        u8 default_length;
         u8 type;
 
 } acpi_fadt_info;
@@ -71,37 +73,61 @@ typedef struct acpi_fadt_info {
 #define ACPI_FADT_SEPARATE_LENGTH   2
 
 static struct acpi_fadt_info fadt_info_table[] = {
-        {"Pm1aEventBlock", ACPI_FADT_OFFSET(xpm1a_event_block),
+        {"Pm1aEventBlock",
+         ACPI_FADT_OFFSET(xpm1a_event_block),
          ACPI_FADT_OFFSET(pm1a_event_block),
-         ACPI_FADT_OFFSET(pm1_event_length), ACPI_FADT_REQUIRED},
+         ACPI_FADT_OFFSET(pm1_event_length),
+         ACPI_PM1_REGISTER_WIDTH * 2,   /* Enable + Status register */
+         ACPI_FADT_REQUIRED},
 
-        {"Pm1bEventBlock", ACPI_FADT_OFFSET(xpm1b_event_block),
+        {"Pm1bEventBlock",
+         ACPI_FADT_OFFSET(xpm1b_event_block),
          ACPI_FADT_OFFSET(pm1b_event_block),
-         ACPI_FADT_OFFSET(pm1_event_length), 0},
+         ACPI_FADT_OFFSET(pm1_event_length),
+         ACPI_PM1_REGISTER_WIDTH * 2,   /* Enable + Status register */
+         0},
 
-        {"Pm1aControlBlock", ACPI_FADT_OFFSET(xpm1a_control_block),
+        {"Pm1aControlBlock",
+         ACPI_FADT_OFFSET(xpm1a_control_block),
          ACPI_FADT_OFFSET(pm1a_control_block),
-         ACPI_FADT_OFFSET(pm1_control_length), ACPI_FADT_REQUIRED},
+         ACPI_FADT_OFFSET(pm1_control_length),
+         ACPI_PM1_REGISTER_WIDTH,
+         ACPI_FADT_REQUIRED},
 
-        {"Pm1bControlBlock", ACPI_FADT_OFFSET(xpm1b_control_block),
+        {"Pm1bControlBlock",
+         ACPI_FADT_OFFSET(xpm1b_control_block),
          ACPI_FADT_OFFSET(pm1b_control_block),
-         ACPI_FADT_OFFSET(pm1_control_length), 0},
+         ACPI_FADT_OFFSET(pm1_control_length),
+         ACPI_PM1_REGISTER_WIDTH,
+         0},
 
-        {"Pm2ControlBlock", ACPI_FADT_OFFSET(xpm2_control_block),
+        {"Pm2ControlBlock",
+         ACPI_FADT_OFFSET(xpm2_control_block),
          ACPI_FADT_OFFSET(pm2_control_block),
-         ACPI_FADT_OFFSET(pm2_control_length), ACPI_FADT_SEPARATE_LENGTH},
+         ACPI_FADT_OFFSET(pm2_control_length),
+         ACPI_PM2_REGISTER_WIDTH,
+         ACPI_FADT_SEPARATE_LENGTH},
 
-        {"PmTimerBlock", ACPI_FADT_OFFSET(xpm_timer_block),
+        {"PmTimerBlock",
+         ACPI_FADT_OFFSET(xpm_timer_block),
          ACPI_FADT_OFFSET(pm_timer_block),
-         ACPI_FADT_OFFSET(pm_timer_length), ACPI_FADT_REQUIRED},
+         ACPI_FADT_OFFSET(pm_timer_length),
+         ACPI_PM_TIMER_WIDTH,
+         ACPI_FADT_REQUIRED},
 
-        {"Gpe0Block", ACPI_FADT_OFFSET(xgpe0_block),
+        {"Gpe0Block",
+         ACPI_FADT_OFFSET(xgpe0_block),
          ACPI_FADT_OFFSET(gpe0_block),
-         ACPI_FADT_OFFSET(gpe0_block_length), ACPI_FADT_SEPARATE_LENGTH},
+         ACPI_FADT_OFFSET(gpe0_block_length),
+         0,
+         ACPI_FADT_SEPARATE_LENGTH},
 
-        {"Gpe1Block", ACPI_FADT_OFFSET(xgpe1_block),
+        {"Gpe1Block",
+         ACPI_FADT_OFFSET(xgpe1_block),
          ACPI_FADT_OFFSET(gpe1_block),
-         ACPI_FADT_OFFSET(gpe1_block_length), ACPI_FADT_SEPARATE_LENGTH}
+         ACPI_FADT_OFFSET(gpe1_block_length),
+         0,
+         ACPI_FADT_SEPARATE_LENGTH}
 };
 
 #define ACPI_FADT_INFO_ENTRIES        (sizeof (fadt_info_table) / sizeof (struct acpi_fadt_info))
@@ -122,9 +148,9 @@ static struct acpi_fadt_info fadt_info_table[] = {
  *
  ******************************************************************************/
 
-static void inline
+static inline void
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 byte_width, u64 address)
+                             u8 space_id, u8 byte_width, u64 address)
 {
 
         /*
@@ -135,10 +161,10 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
 
         /* All other fields are byte-wide */
 
-        generic_address->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
-        generic_address->bit_width = byte_width << 3;
+        generic_address->space_id = space_id;
+        generic_address->bit_width = (u8)ACPI_MUL_8(byte_width);
         generic_address->bit_offset = 0;
-        generic_address->access_width = 0;
+        generic_address->access_width = 0;      /* Access width ANY */
 }
 
 /*******************************************************************************
@@ -225,7 +251,8 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
          */
         if (length > sizeof(struct acpi_table_fadt)) {
                 ACPI_WARNING((AE_INFO,
-                              "FADT (revision %u) is longer than ACPI 2.0 version, truncating length 0x%X to 0x%zX",
+                              "FADT (revision %u) is longer than ACPI 2.0 version, "
+                              "truncating length 0x%X to 0x%zX",
                               table->revision, (unsigned)length,
                               sizeof(struct acpi_table_fadt)));
         }
@@ -244,7 +271,6 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
          * 2) Validate some of the important values within the FADT
          */
         acpi_tb_convert_fadt();
-        acpi_tb_validate_fadt();
 }
 
 /*******************************************************************************
@@ -278,22 +304,36 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 
 static void acpi_tb_convert_fadt(void)
 {
-        u8 pm1_register_length;
-        struct acpi_generic_address *target;
+        u8 pm1_register_bit_width;
+        u8 pm1_register_byte_width;
+        struct acpi_generic_address *target64;
         u32 i;
 
         /* Update the local FADT table header length */
 
         acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
 
-        /* Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary */
-
+        /*
+         * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
+         * Later code will always use the X 64-bit field. Also, check for an
+         * address mismatch between the 32-bit and 64-bit address fields
+         * (FIRMWARE_CTRL/X_FIRMWARE_CTRL, DSDT/X_DSDT) which would indicate
+         * the presence of two FACS or two DSDT tables.
+         */
         if (!acpi_gbl_FADT.Xfacs) {
                 acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
+        } else if (acpi_gbl_FADT.facs &&
+                   (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
+                ACPI_WARNING((AE_INFO,
+                    "32/64 FACS address mismatch in FADT - two FACS tables!"));
         }
 
         if (!acpi_gbl_FADT.Xdsdt) {
                 acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
+        } else if (acpi_gbl_FADT.dsdt &&
+                   (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
+                ACPI_WARNING((AE_INFO,
+                    "32/64 DSDT address mismatch in FADT - two DSDT tables!"));
         }
 
         /*
@@ -312,18 +352,23 @@ static void acpi_tb_convert_fadt(void)
         }
 
         /*
-         * Expand the ACPI 1.0 32-bit V1.0 addresses to the ACPI 2.0 64-bit "X"
-         * generic address structures as necessary.
+         * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
+         * generic address structures as necessary. Later code will always use
+         * the 64-bit address structures.
          */
         for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
-                target =
+                target64 =
                     ACPI_ADD_PTR(struct acpi_generic_address, &acpi_gbl_FADT,
-                                 fadt_info_table[i].target);
+                                 fadt_info_table[i].address64);
 
-                /* Expand only if the X target is null */
+                /* Expand only if the 64-bit X target is null */
 
-                if (!target->address) {
-                        acpi_tb_init_generic_address(target,
+                if (!target64->address) {
+
+                        /* The space_id is always I/O for the 32-bit legacy address fields */
+
+                        acpi_tb_init_generic_address(target64,
+                                                     ACPI_ADR_SPACE_SYSTEM_IO,
                                                      *ACPI_ADD_PTR(u8,
                                                                    &acpi_gbl_FADT,
                                                                    fadt_info_table
@@ -332,11 +377,64 @@ static void acpi_tb_convert_fadt(void)
                                                                           &acpi_gbl_FADT,
                                                                           fadt_info_table
                                                                           [i].
-                                                                          source));
+                                                                          address32));
+                }
+        }
+
+        /* Validate FADT values now, before we make any changes */
+
+        acpi_tb_validate_fadt();
+
+        /*
+         * Optionally check all register lengths against the default values and
+         * update them if they are incorrect.
+         */
+        if (acpi_gbl_use_default_register_widths) {
+                for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+                        target64 =
+                            ACPI_ADD_PTR(struct acpi_generic_address,
+                                         &acpi_gbl_FADT,
+                                         fadt_info_table[i].address64);
+
+                        /*
+                         * If a valid register (Address != 0) and the (default_length > 0)
+                         * (Not a GPE register), then check the width against the default.
+                         */
+                        if ((target64->address) &&
+                            (fadt_info_table[i].default_length > 0) &&
+                            (fadt_info_table[i].default_length !=
+                             target64->bit_width)) {
+                                ACPI_WARNING((AE_INFO,
+                                              "Invalid length for %s: %d, using default %d",
+                                              fadt_info_table[i].name,
+                                              target64->bit_width,
+                                              fadt_info_table[i].
+                                              default_length));
+
+                                /* Incorrect size, set width to the default */
+
+                                target64->bit_width =
+                                    fadt_info_table[i].default_length;
+                        }
                 }
         }
 
         /*
+         * Get the length of the individual PM1 registers (enable and status).
+         * Each register is defined to be (event block length / 2).
+         */
+        pm1_register_bit_width =
+            (u8)ACPI_DIV_2(acpi_gbl_FADT.xpm1a_event_block.bit_width);
+        pm1_register_byte_width = (u8)ACPI_DIV_8(pm1_register_bit_width);
+
+        /*
+         * Adjust the lengths of the PM1 Event Blocks so that they can be used to
+         * access the PM1 status register(s). Use (width / 2)
+         */
+        acpi_gbl_FADT.xpm1a_event_block.bit_width = pm1_register_bit_width;
+        acpi_gbl_FADT.xpm1b_event_block.bit_width = pm1_register_bit_width;
+
+        /*
          * Calculate separate GAS structs for the PM1 Enable registers.
          * These addresses do not appear (directly) in the FADT, so it is
          * useful to calculate them once, here.
@@ -356,14 +454,14 @@ static void acpi_tb_convert_fadt(void)
                        " PM1_EVT_LEN (%u)\n",
                        acpi_gbl_FADT.xpm1a_event_block.bit_width,
                        acpi_gbl_FADT.pm1_event_length);
-        pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
 
         /* The PM1A register block is required */
 
         acpi_tb_init_generic_address(&acpi_gbl_xpm1a_enable,
-                                     pm1_register_length,
+                                     acpi_gbl_FADT.xpm1a_event_block.space_id,
+                                     pm1_register_byte_width,
                                      (acpi_gbl_FADT.xpm1a_event_block.address +
-                                      pm1_register_length));
+                                      pm1_register_byte_width));
         /* Don't forget to copy space_id of the GAS */
         acpi_gbl_xpm1a_enable.space_id =
             acpi_gbl_FADT.xpm1a_event_block.space_id;
@@ -379,9 +477,10 @@ static void acpi_tb_convert_fadt(void)
                                acpi_gbl_FADT.xpm1b_event_block.bit_width,
                                acpi_gbl_FADT.pm1_event_length);
                 acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
-                                             pm1_register_length,
+                                             acpi_gbl_FADT.xpm1b_event_block.space_id,
+                                             pm1_register_byte_width,
                                              (acpi_gbl_FADT.xpm1b_event_block.
-                                              address + pm1_register_length));
+                                              address + pm1_register_byte_width));
                 /* Don't forget to copy space_id of the GAS */
                 acpi_gbl_xpm1b_enable.space_id =
                     acpi_gbl_FADT.xpm1b_event_block.space_id;
@@ -411,26 +510,63 @@ static void acpi_tb_convert_fadt(void)
 
 static void acpi_tb_validate_fadt(void)
 {
+        char *name;
         u32 *address32;
         struct acpi_generic_address *address64;
         u8 length;
         u32 i;
 
-        /* Examine all of the 64-bit extended address fields (X fields) */
+        /*
+         * Check for FACS and DSDT address mismatches. An address mismatch between
+         * the 32-bit and 64-bit address fields (FIRMWARE_CTRL/X_FIRMWARE_CTRL and
+         * DSDT/X_DSDT) would indicate the presence of two FACS or two DSDT tables.
+         */
+        if (acpi_gbl_FADT.facs &&
+            (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {
+                ACPI_WARNING((AE_INFO,
+                              "32/64X FACS address mismatch in FADT - "
+                              "two FACS tables! %8.8X/%8.8X%8.8X",
+                              acpi_gbl_FADT.facs,
+                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));
+        }
 
-        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+        if (acpi_gbl_FADT.dsdt &&
+            (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {
+                ACPI_WARNING((AE_INFO,
+                              "32/64X DSDT address mismatch in FADT - "
+                              "two DSDT tables! %8.8X/%8.8X%8.8X",
+                              acpi_gbl_FADT.dsdt,
+                              ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));
+        }
 
-                /* Generate pointers to the 32-bit and 64-bit addresses and get the length */
+        /* Examine all of the 64-bit extended address fields (X fields) */
 
-                address64 =
-                    ACPI_ADD_PTR(struct acpi_generic_address, &acpi_gbl_FADT,
-                                 fadt_info_table[i].target);
+        for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+                /*
+                 * Generate pointers to the 32-bit and 64-bit addresses, get the
+                 * register length (width), and the register name
+                 */
+                address64 = ACPI_ADD_PTR(struct acpi_generic_address,
+                                         &acpi_gbl_FADT,
+                                         fadt_info_table[i].address64);
                 address32 =
                     ACPI_ADD_PTR(u32, &acpi_gbl_FADT,
-                                 fadt_info_table[i].source);
+                                 fadt_info_table[i].address32);
                 length =
                     *ACPI_ADD_PTR(u8, &acpi_gbl_FADT,
                                   fadt_info_table[i].length);
+                name = fadt_info_table[i].name;
+
+                /*
+                 * For each extended field, check for length mismatch between the
+                 * legacy length field and the corresponding 64-bit X length field.
+                 */
+                if (address64 && (address64->bit_width != ACPI_MUL_8(length))) {
+                        ACPI_WARNING((AE_INFO,
+                                      "32/64X length mismatch in %s: %d/%d",
+                                      name, ACPI_MUL_8(length),
+                                      address64->bit_width));
+                }
 
                 if (fadt_info_table[i].type & ACPI_FADT_REQUIRED) {
                         /*
@@ -439,8 +575,8 @@ static void acpi_tb_validate_fadt(void)
                          */
                         if (!address64->address || !length) {
                                 ACPI_ERROR((AE_INFO,
-                                            "Required field \"%s\" has zero address and/or length: %8.8X%8.8X/%X",
-                                            fadt_info_table[i].name,
+                                            "Required field %s has zero address and/or length: %8.8X%8.8X/%X",
+                                            name,
                                             ACPI_FORMAT_UINT64(address64->
                                                                address),
                                             length));
@@ -453,8 +589,8 @@ static void acpi_tb_validate_fadt(void)
                         if ((address64->address && !length)
                             || (!address64->address && length)) {
                                 ACPI_WARNING((AE_INFO,
-                                              "Optional field \"%s\" has zero address or length: %8.8X%8.8X/%X",
-                                              fadt_info_table[i].name,
+                                              "Optional field %s has zero address or length: %8.8X%8.8X/%X",
+                                              name,
                                               ACPI_FORMAT_UINT64(address64->
                                                                  address),
                                               length));
@@ -466,8 +602,8 @@ static void acpi_tb_validate_fadt(void)
                 if (address64->address && *address32 &&
                     (address64->address != (u64) * address32)) {
                         ACPI_ERROR((AE_INFO,
-                                    "32/64X address mismatch in \"%s\": [%8.8X] [%8.8X%8.8X], using 64X",
-                                    fadt_info_table[i].name, *address32,
+                                    "32/64X address mismatch in %s: %8.8X/%8.8X%8.8X, using 64X",
+                                    name, *address32,
                                     ACPI_FORMAT_UINT64(address64->address)));
                 }
         }
diff --git a/drivers/acpi/tables/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 531584defbb8..1054dfd49207 100644
--- a/drivers/acpi/tables/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbfind")
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 18747ce8dd2f..37374b21969d 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbinstal")
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 0cc92ef5236f..9684cc827930 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbutils")
@@ -113,6 +114,30 @@ acpi_tb_check_xsdt(acpi_physical_address address)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_tb_initialize_facs
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a permanent mapping for the FADT and save it in a global
+ *              for accessing the Global Lock and Firmware Waking Vector
+ *
+ ******************************************************************************/
+
+acpi_status acpi_tb_initialize_facs(void)
+{
+        acpi_status status;
+
+        status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                         ACPI_CAST_INDIRECT_PTR(struct
+                                                                acpi_table_header,
+                                                                &acpi_gbl_FACS));
+        return status;
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_tb_tables_loaded
  *
  * PARAMETERS:  None
@@ -420,7 +445,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 
         /* Differentiate between RSDT and XSDT root tables */
 
-        if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
+        if (rsdp->revision > 1 && rsdp->xsdt_physical_address
+                        && !acpi_rsdt_forced) {
                 /*
                  * Root table is an XSDT (64-bit physical addresses). We must use the
                  * XSDT if the revision is > 1 and the XSDT pointer is present, as per
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/acpica/tbxface.c
index fd7770aa1061..c3e841f3cde9 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -43,8 +43,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxface")
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 2d157e0f98d2..b7fc8dd43341 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxfroot")
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 241c535c1753..7580f6b3069e 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acdebug.h>
+#include "accommon.h"
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utalloc")
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 5b2f7c27b705..b0dcfd3c872a 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/acpica/utdebug.c
index fd66ecb6741e..38821f53042c 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
@@ -136,7 +137,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_debug_print
+ * FUNCTION:    acpi_debug_print
  *
  * PARAMETERS:  requested_debug_level - Requested debug print level
  *              line_number         - Caller's line number (for error output)
@@ -154,11 +155,11 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
  ******************************************************************************/
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_debug_print(u32 requested_debug_level,
-                    u32 line_number,
-                    const char *function_name,
-                    const char *module_name,
-                    u32 component_id, const char *format, ...)
+acpi_debug_print(u32 requested_debug_level,
+                 u32 line_number,
+                 const char *function_name,
+                 const char *module_name,
+                 u32 component_id, const char *format, ...)
 {
         acpi_thread_id thread_id;
         va_list args;
@@ -205,11 +206,11 @@ acpi_ut_debug_print(u32 requested_debug_level,
         va_end(args);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)
+ACPI_EXPORT_SYMBOL(acpi_debug_print)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_debug_print_raw
+ * FUNCTION:    acpi_debug_print_raw
  *
  * PARAMETERS:  requested_debug_level - Requested debug print level
  *              line_number         - Caller's line number
@@ -226,11 +227,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)
  *
  ******************************************************************************/
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_debug_print_raw(u32 requested_debug_level,
-                        u32 line_number,
-                        const char *function_name,
-                        const char *module_name,
-                        u32 component_id, const char *format, ...)
+acpi_debug_print_raw(u32 requested_debug_level,
+                     u32 line_number,
+                     const char *function_name,
+                     const char *module_name,
+                     u32 component_id, const char *format, ...)
 {
         va_list args;
 
@@ -244,7 +245,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level,
         va_end(args);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw)
+ACPI_EXPORT_SYMBOL(acpi_debug_print_raw)
 
 /*******************************************************************************
  *
@@ -270,9 +271,9 @@ acpi_ut_trace(u32 line_number,
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s\n", acpi_gbl_fn_entry_str);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s\n", acpi_gbl_fn_entry_str);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_ut_trace)
@@ -301,10 +302,9 @@ acpi_ut_trace_ptr(u32 line_number,
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s %p\n", acpi_gbl_fn_entry_str,
-                            pointer);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s %p\n", acpi_gbl_fn_entry_str, pointer);
 }
 
 /*******************************************************************************
@@ -333,10 +333,9 @@ acpi_ut_trace_str(u32 line_number,
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s %s\n", acpi_gbl_fn_entry_str,
-                            string);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s %s\n", acpi_gbl_fn_entry_str, string);
 }
 
 /*******************************************************************************
@@ -365,10 +364,9 @@ acpi_ut_trace_u32(u32 line_number,
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s %08X\n", acpi_gbl_fn_entry_str,
-                            integer);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s %08X\n", acpi_gbl_fn_entry_str, integer);
 }
 
 /*******************************************************************************
@@ -393,9 +391,9 @@ acpi_ut_exit(u32 line_number,
              const char *module_name, u32 component_id)
 {
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s\n", acpi_gbl_fn_exit_str);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s\n", acpi_gbl_fn_exit_str);
 
         acpi_gbl_nesting_level--;
 }
@@ -426,17 +424,16 @@ acpi_ut_status_exit(u32 line_number,
 {
 
         if (ACPI_SUCCESS(status)) {
-                acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                                    line_number, function_name, module_name,
-                                    component_id, "%s %s\n",
-                                    acpi_gbl_fn_exit_str,
-                                    acpi_format_exception(status));
+                acpi_debug_print(ACPI_LV_FUNCTIONS,
+                                 line_number, function_name, module_name,
+                                 component_id, "%s %s\n", acpi_gbl_fn_exit_str,
+                                 acpi_format_exception(status));
         } else {
-                acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                                    line_number, function_name, module_name,
-                                    component_id, "%s ****Exception****: %s\n",
-                                    acpi_gbl_fn_exit_str,
-                                    acpi_format_exception(status));
+                acpi_debug_print(ACPI_LV_FUNCTIONS,
+                                 line_number, function_name, module_name,
+                                 component_id, "%s ****Exception****: %s\n",
+                                 acpi_gbl_fn_exit_str,
+                                 acpi_format_exception(status));
         }
 
         acpi_gbl_nesting_level--;
@@ -467,10 +464,10 @@ acpi_ut_value_exit(u32 line_number,
                    u32 component_id, acpi_integer value)
 {
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s %8.8X%8.8X\n",
-                            acpi_gbl_fn_exit_str, ACPI_FORMAT_UINT64(value));
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str,
+                         ACPI_FORMAT_UINT64(value));
 
         acpi_gbl_nesting_level--;
 }
@@ -499,9 +496,9 @@ acpi_ut_ptr_exit(u32 line_number,
                  const char *module_name, u32 component_id, u8 *ptr)
 {
 
-        acpi_ut_debug_print(ACPI_LV_FUNCTIONS,
-                            line_number, function_name, module_name,
-                            component_id, "%s %p\n", acpi_gbl_fn_exit_str, ptr);
+        acpi_debug_print(ACPI_LV_FUNCTIONS,
+                         line_number, function_name, module_name, component_id,
+                         "%s %p\n", acpi_gbl_fn_exit_str, ptr);
 
         acpi_gbl_nesting_level--;
 }
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/acpica/utdelete.c
index d197c6b29e17..a0be9e39531e 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acinterp.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "accommon.h"
+#include "acinterp.h"
+#include "acnamesp.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdelete")
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/acpica/uteval.c
index 352747e49c7a..da9450bc60f7 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -42,8 +42,9 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("uteval")
@@ -129,7 +130,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
 
                         /* The interface is supported */
 
-                        return_ACPI_STATUS(AE_CTRL_TERMINATE);
+                        return_ACPI_STATUS(AE_OK);
                 }
         }
 
@@ -143,13 +144,13 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
 
                 /* The interface is supported */
 
-                return_ACPI_STATUS(AE_CTRL_TERMINATE);
+                return_ACPI_STATUS(AE_OK);
         }
 
         /* The interface is not supported */
 
         return_desc->integer.value = 0;
-        return_ACPI_STATUS(AE_CTRL_TERMINATE);
+        return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 17ed5ac840f7..a3ab9d9da299 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -44,11 +44,11 @@
 #define DEFINE_ACPI_GLOBALS
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
-ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 #define _COMPONENT          ACPI_UTILITIES
-    ACPI_MODULE_NAME("utglobal")
+ACPI_MODULE_NAME("utglobal")
 
 /*******************************************************************************
  *
@@ -352,7 +352,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
         "PCI_Config",
         "EmbeddedControl",
         "SMBus",
-        "CMOS",
+        "SystemCMOS",
         "PCIBARTarget",
         "DataTable"
 };
@@ -756,6 +756,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_gpe_xrupt_list_head = NULL;
         acpi_gbl_gpe_fadt_blocks[0] = NULL;
         acpi_gbl_gpe_fadt_blocks[1] = NULL;
+        acpi_current_gpe_count = 0;
 
         /* Global handlers */
 
@@ -771,6 +772,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_global_lock_mutex = NULL;
         acpi_gbl_global_lock_acquired = FALSE;
         acpi_gbl_global_lock_handle = 0;
+        acpi_gbl_global_lock_present = FALSE;
 
         /* Miscellaneous variables */
 
@@ -815,5 +817,7 @@ acpi_status acpi_ut_init_globals(void)
         return_ACPI_STATUS(AE_OK);
 }
 
+ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+ACPI_EXPORT_SYMBOL(acpi_current_gpe_count)
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/acpica/utinit.c
index cae515fc02d3..a54ca84eb362 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -42,9 +42,10 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
-#include <acpi/actables.h>
+#include "accommon.h"
+#include "acnamesp.h"
+#include "acevents.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utinit")
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/acpica/utmath.c
index c927324fdd26..c9f682d640ef 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmath")
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 9089a158a874..c1f7f4e1a72d 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -44,7 +44,8 @@
 #include <linux/module.h>
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
@@ -1016,7 +1017,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_error, acpi_ut_warning, acpi_ut_info
+ * FUNCTION:    acpi_error, acpi_exception, acpi_warning, acpi_info
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
@@ -1029,7 +1030,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
  ******************************************************************************/
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...)
+acpi_error(const char *module_name, u32 line_number, const char *format, ...)
 {
         va_list args;
 
@@ -1042,8 +1043,8 @@ acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...)
 }
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_exception(const char *module_name,
-                  u32 line_number, acpi_status status, const char *format, ...)
+acpi_exception(const char *module_name,
+               u32 line_number, acpi_status status, const char *format, ...)
 {
         va_list args;
 
@@ -1056,11 +1057,8 @@ acpi_ut_exception(const char *module_name,
         va_end(args);
 }
 
-EXPORT_SYMBOL(acpi_ut_exception);
-
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_warning(const char *module_name,
-                u32 line_number, const char *format, ...)
+acpi_warning(const char *module_name, u32 line_number, const char *format, ...)
 {
         va_list args;
 
@@ -1073,7 +1071,7 @@ acpi_ut_warning(const char *module_name,
 }
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...)
+acpi_info(const char *module_name, u32 line_number, const char *format, ...)
 {
         va_list args;
 
@@ -1088,3 +1086,8 @@ acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...)
         acpi_os_printf("\n");
         va_end(args);
 }
+
+ACPI_EXPORT_SYMBOL(acpi_error)
+ACPI_EXPORT_SYMBOL(acpi_exception)
+ACPI_EXPORT_SYMBOL(acpi_warning)
+ACPI_EXPORT_SYMBOL(acpi_info)
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 7331dde9e1b3..14eb52c4d647 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmutex")
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/acpica/utobject.c
index 4bef3cfbaccb..fd5ea7543e5b 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utobject")
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/acpica/utresrc.c
index c3e3e1308edc..91b7c00236f4 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -42,7 +42,8 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/amlresrc.h>
+#include "accommon.h"
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/acpica/utstate.c
index 63a6d3d77d88..0440c958f5a4 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -42,6 +42,7 @@
  */
 
 #include <acpi/acpi.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utstate")
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/acpica/utxface.c
index c198a4d40583..078a22728c6b 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -42,9 +42,11 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/acevents.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+#include "acdebug.h"
+#include "actables.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxface")
@@ -148,6 +150,16 @@ acpi_status acpi_enable_subsystem(u32 flags)
         }
 
         /*
+         * Obtain a permanent mapping for the FACS. This is required for the
+         * Global Lock and the Firmware Waking Vector
+         */
+        status = acpi_tb_initialize_facs();
+        if (ACPI_FAILURE(status)) {
+                ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
+                return_ACPI_STATUS(status);
+        }
+
+        /*
          * Install the default op_region handlers. These are installed unless
          * other handlers have already been installed via the
          * install_address_space_handler interface.
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 1423b0c0cd2e..65132f920459 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -471,7 +471,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
 
 static int acpi_battery_update(struct acpi_battery *battery)
 {
-        int result;
+        int result, old_present = acpi_battery_present(battery);
         result = acpi_battery_get_status(battery);
         if (result)
                 return result;
@@ -482,7 +482,8 @@ static int acpi_battery_update(struct acpi_battery *battery)
                 return 0;
         }
 #endif
-        if (!battery->update_time) {
+        if (!battery->update_time ||
+            old_present != acpi_battery_present(battery)) {
                 result = acpi_battery_get_info(battery);
                 if (result)
                         return result;
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
index 307963bd1043..332fe4b21708 100644
--- a/drivers/acpi/cm_sbs.c
+++ b/drivers/acpi/cm_sbs.c
@@ -27,9 +27,6 @@
 #include <linux/seq_file.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
-#include <acpi/acutils.h>
 
 ACPI_MODULE_NAME("cm_sbs");
 #define ACPI_AC_CLASS           "ac_adapter"
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
index c48396892008..20223cbd0d1c 100644
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -9,7 +9,6 @@
 #include <linux/moduleparam.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_drivers.h>
-#include <acpi/acglobal.h>
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debug");
diff --git a/drivers/acpi/dispatcher/Makefile b/drivers/acpi/dispatcher/Makefile
deleted file mode 100644
index eb7e602a83cd..000000000000
--- a/drivers/acpi/dispatcher/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
-         dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
-         dsinit.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 30f3ef236ecb..8dfcbb8aff73 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -42,7 +42,6 @@
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-#include <acpi/actypes.h>
 
 #define ACPI_EC_CLASS                   "embedded_controller"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
@@ -370,7 +369,7 @@ unlock:
  * Note: samsung nv5000 doesn't work with ec burst mode.
  * http://bugzilla.kernel.org/show_bug.cgi?id=4980
  */
-int acpi_ec_burst_enable(struct acpi_ec *ec)
+static int acpi_ec_burst_enable(struct acpi_ec *ec)
 {
         u8 d;
         struct transaction t = {.command = ACPI_EC_BURST_ENABLE,
@@ -380,7 +379,7 @@ int acpi_ec_burst_enable(struct acpi_ec *ec)
         return acpi_ec_transaction(ec, &t, 0);
 }
 
-int acpi_ec_burst_disable(struct acpi_ec *ec)
+static int acpi_ec_burst_disable(struct acpi_ec *ec)
 {
         struct transaction t = {.command = ACPI_EC_BURST_DISABLE,
                                 .wdata = NULL, .rdata = NULL,
@@ -756,10 +755,15 @@ static acpi_status
 acpi_ec_register_query_methods(acpi_handle handle, u32 level,
                                void *context, void **return_value)
 {
-        struct acpi_namespace_node *node = handle;
+        char node_name[5];
+        struct acpi_buffer buffer = { sizeof(node_name), node_name };
         struct acpi_ec *ec = context;
         int value = 0;
-        if (sscanf(node->name.ascii, "_Q%x", &value) == 1) {
+        acpi_status status;
+
+        status = acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
+
+        if (ACPI_SUCCESS(status) && sscanf(node_name, "_Q%x", &value) == 1) {
                 acpi_ec_add_query_handler(ec, value, handle, NULL, NULL);
         }
         return AE_OK;
@@ -978,9 +982,9 @@ static const struct acpi_device_id ec_device_ids[] = {
 
 int __init acpi_ec_ecdt_probe(void)
 {
-        int ret;
         acpi_status status;
         struct acpi_table_ecdt *ecdt_ptr;
+        acpi_handle dummy;
 
         boot_ec = make_acpi_ec();
         if (!boot_ec)
@@ -1006,30 +1010,31 @@ int __init acpi_ec_ecdt_probe(void)
                 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 */
-                acpi_handle x;
-                printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
-                status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
-                                                boot_ec, NULL);
-                /* Check that acpi_get_devices actually find something */
-                if (ACPI_FAILURE(status) || !boot_ec->handle)
-                        goto error;
-                /* We really need to limit this workaround, the only ASUS,
-                 * which needs it, has fake EC._INI method, so use it as flag.
-                 * Keep boot_ec struct as it will be needed soon.
-                 */
-                if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
-                        return -ENODEV;
+                /* Add some basic check against completely broken table */
+                if (boot_ec->data_addr != boot_ec->command_addr)
+                        goto install;
+        /* fall through */
         }
-
-        ret = ec_install_handlers(boot_ec);
-        if (!ret) {
+        /* This workaround is needed only on some broken machines,
+         * which require early EC, but fail to provide ECDT */
+        printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
+        status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
+                                        boot_ec, NULL);
+        /* Check that acpi_get_devices actually find something */
+        if (ACPI_FAILURE(status) || !boot_ec->handle)
+                goto error;
+        /* We really need to limit this workaround, the only ASUS,
+         * which needs it, has fake EC._INI method, so use it as flag.
+         * Keep boot_ec struct as it will be needed soon.
+         */
+        if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))
+                return -ENODEV;
+install:
+        if (!ec_install_handlers(boot_ec)) {
                 first_ec = boot_ec;
                 return 0;
         }
-      error:
+error:
         kfree(boot_ec);
         boot_ec = NULL;
         return -ENODEV;
diff --git a/drivers/acpi/events/Makefile b/drivers/acpi/events/Makefile
deleted file mode 100644
index d29f2ee449cc..000000000000
--- a/drivers/acpi/events/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := evevent.o  evregion.o  evsci.o    evxfevnt.o \
-         evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
-         evgpe.o    evgpeblk.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/executer/Makefile b/drivers/acpi/executer/Makefile
deleted file mode 100644
index e09998aa012f..000000000000
--- a/drivers/acpi/executer/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
-         exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
-         excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
-         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/hardware/Makefile b/drivers/acpi/hardware/Makefile
deleted file mode 100644
index 438ad373b9ad..000000000000
--- a/drivers/acpi/hardware/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o
-
-obj-$(ACPI_FUTURE_USAGE) += hwtimer.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/main.c
index 28a691cc625e..7e3c609cbef2 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/main.c
@@ -101,13 +101,26 @@ void __init acpi_old_suspend_ordering(void)
  * cases.
  */
 static bool set_sci_en_on_resume;
+/*
+ * The ACPI specification wants us to save NVS memory regions during hibernation
+ * and to restore them during the subsequent resume.  However, it is not certain
+ * if this mechanism is going to work on all machines, so we allow the user to
+ * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
+ * option.
+ */
+static bool s4_no_nvs;
+
+void __init acpi_s4_no_nvs(void)
+{
+        s4_no_nvs = true;
+}
 
 /**
  *      acpi_pm_disable_gpes - Disable the GPEs.
  */
 static int acpi_pm_disable_gpes(void)
 {
-        acpi_hw_disable_all_gpes();
+        acpi_disable_all_gpes();
         return 0;
 }
 
@@ -135,7 +148,7 @@ static int acpi_pm_prepare(void)
         int error = __acpi_pm_prepare();
 
         if (!error)
-                acpi_hw_disable_all_gpes();
+                acpi_disable_all_gpes();
         return error;
 }
 
@@ -267,7 +280,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
          * (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
          * acpi_leave_sleep_state will reenable specific GPEs later
          */
-        acpi_hw_disable_all_gpes();
+        acpi_disable_all_gpes();
 
         local_irq_restore(flags);
         printk(KERN_DEBUG "Back to C!\n");
@@ -394,9 +407,25 @@ void __init acpi_no_s4_hw_signature(void)
 
 static int acpi_hibernation_begin(void)
 {
-        acpi_target_sleep_state = ACPI_STATE_S4;
-        acpi_sleep_tts_switch(acpi_target_sleep_state);
-        return 0;
+        int error;
+
+        error = s4_no_nvs ? 0 : hibernate_nvs_alloc();
+        if (!error) {
+                acpi_target_sleep_state = ACPI_STATE_S4;
+                acpi_sleep_tts_switch(acpi_target_sleep_state);
+        }
+
+        return error;
+}
+
+static int acpi_hibernation_pre_snapshot(void)
+{
+        int error = acpi_pm_prepare();
+
+        if (!error)
+                hibernate_nvs_save();
+
+        return error;
 }
 
 static int acpi_hibernation_enter(void)
@@ -417,6 +446,12 @@ static int acpi_hibernation_enter(void)
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
+static void acpi_hibernation_finish(void)
+{
+        hibernate_nvs_free();
+        acpi_pm_finish();
+}
+
 static void acpi_hibernation_leave(void)
 {
         /*
@@ -432,18 +467,20 @@ static void acpi_hibernation_leave(void)
                         "cannot resume!\n");
                 panic("ACPI S4 hardware signature mismatch");
         }
+        /* Restore the NVS memory area */
+        hibernate_nvs_restore();
 }
 
 static void acpi_pm_enable_gpes(void)
 {
-        acpi_hw_enable_all_runtime_gpes();
+        acpi_enable_all_runtime_gpes();
 }
 
 static struct platform_hibernation_ops acpi_hibernation_ops = {
         .begin = acpi_hibernation_begin,
         .end = acpi_pm_end,
-        .pre_snapshot = acpi_pm_prepare,
-        .finish = acpi_pm_finish,
+        .pre_snapshot = acpi_hibernation_pre_snapshot,
+        .finish = acpi_hibernation_finish,
         .prepare = acpi_pm_prepare,
         .enter = acpi_hibernation_enter,
         .leave = acpi_hibernation_leave,
@@ -469,8 +506,22 @@ static int acpi_hibernation_begin_old(void)
 
         error = acpi_sleep_prepare(ACPI_STATE_S4);
 
+        if (!error) {
+                if (!s4_no_nvs)
+                        error = hibernate_nvs_alloc();
+                if (!error)
+                        acpi_target_sleep_state = ACPI_STATE_S4;
+        }
+        return error;
+}
+
+static int acpi_hibernation_pre_snapshot_old(void)
+{
+        int error = acpi_pm_disable_gpes();
+
         if (!error)
-                acpi_target_sleep_state = ACPI_STATE_S4;
+                hibernate_nvs_save();
+
         return error;
 }
 
@@ -481,8 +532,8 @@ static int acpi_hibernation_begin_old(void)
 static struct platform_hibernation_ops acpi_hibernation_ops_old = {
         .begin = acpi_hibernation_begin_old,
         .end = acpi_pm_end,
-        .pre_snapshot = acpi_pm_disable_gpes,
-        .finish = acpi_pm_finish,
+        .pre_snapshot = acpi_hibernation_pre_snapshot_old,
+        .finish = acpi_hibernation_finish,
         .prepare = acpi_pm_disable_gpes,
         .enter = acpi_hibernation_enter,
         .leave = acpi_hibernation_leave,
@@ -622,7 +673,7 @@ static void acpi_power_off_prepare(void)
 {
         /* Prepare to power off the system */
         acpi_sleep_prepare(ACPI_STATE_S5);
-        acpi_hw_disable_all_gpes();
+        acpi_disable_all_gpes();
 }
 
 static void acpi_power_off(void)
@@ -671,7 +722,7 @@ int __init acpi_sleep_init(void)
                 sleep_states[ACPI_STATE_S4] = 1;
                 printk(" S4");
                 if (!nosigcheck) {
-                        acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                        acpi_get_table(ACPI_SIG_FACS, 1,
                                 (struct acpi_table_header **)&facs);
                         if (facs)
                                 s4_hardware_signature =
diff --git a/drivers/acpi/namespace/Makefile b/drivers/acpi/namespace/Makefile
deleted file mode 100644
index 371a2daf837f..000000000000
--- a/drivers/acpi/namespace/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
-         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
-         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
-         nsparse.o   nspredef.o
-
-obj-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 25ceae9191ef..c5e292aab0e3 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/acmacros.h>
 
 #define ACPI_NUMA       0x80000000
 #define _COMPONENT      ACPI_NUMA
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c8111424dcb8..6729a4992f2b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
 
         dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
         if (!dpc)
-                return_ACPI_STATUS(AE_NO_MEMORY);
+                return AE_NO_MEMORY;
 
         dpc->function = function;
         dpc->context = context;
@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
                 status = AE_ERROR;
                 kfree(dpc);
         }
-        return_ACPI_STATUS(status);
+        return status;
 }
 
 acpi_status acpi_os_execute(acpi_execute_type type,
diff --git a/drivers/acpi/parser/Makefile b/drivers/acpi/parser/Makefile
deleted file mode 100644
index db24ee09cf11..000000000000
--- a/drivers/acpi/parser/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
-         psopcode.o  psscope.o  psutils.o  psxface.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 4b252ea0e952..95650f83ce2e 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -99,7 +99,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
          */
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Device %s has PCI address %02x:%02x:%02x.%02x\n",
+                          "Device %s has PCI address %04x:%02x:%02x.%d\n",
                           acpi_device_bid(device), id->segment, id->bus,
                           id->device, id->function));
 
@@ -111,12 +111,11 @@ EXPORT_SYMBOL(acpi_get_pci_id);
 int acpi_pci_bind(struct acpi_device *device)
 {
         int result = 0;
-        acpi_status status = AE_OK;
-        struct acpi_pci_data *data = NULL;
-        struct acpi_pci_data *pdata = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
-        acpi_handle handle = NULL;
+        acpi_status status;
+        struct acpi_pci_data *data;
+        struct acpi_pci_data *pdata;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        acpi_handle handle;
         struct pci_dev *dev;
         struct pci_bus *bus;
 
@@ -124,21 +123,18 @@ int acpi_pci_bind(struct acpi_device *device)
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
-
         data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-        if (!data) {
-                kfree(pathname);
+        if (!data)
                 return -ENOMEM;
+
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status)) {
+                kfree(data);
+                return -ENODEV;
         }
 
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n",
-                          pathname));
+                          (char *)buffer.pointer));
 
         /* 
          * Segment & Bus
@@ -166,7 +162,7 @@ int acpi_pci_bind(struct acpi_device *device)
         data->id.device = device->pnp.bus_address >> 16;
         data->id.function = device->pnp.bus_address & 0xFFFF;
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %02x:%02x:%02x.%02x\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %04x:%02x:%02x.%d\n",
                           data->id.segment, data->id.bus, data->id.device,
                           data->id.function));
 
@@ -196,7 +192,7 @@ int acpi_pci_bind(struct acpi_device *device)
         }
         if (!data->dev) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Device %02x:%02x:%02x.%02x not present in PCI namespace\n",
+                                  "Device %04x:%02x:%02x.%d not present in PCI namespace\n",
                                   data->id.segment, data->id.bus,
                                   data->id.device, data->id.function));
                 result = -ENODEV;
@@ -204,7 +200,7 @@ int acpi_pci_bind(struct acpi_device *device)
         }
         if (!data->dev->bus) {
                 printk(KERN_ERR PREFIX
-                            "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",
+                            "Device %04x:%02x:%02x.%d has invalid 'bus' field\n",
                             data->id.segment, data->id.bus,
                             data->id.device, data->id.function);
                 result = -ENODEV;
@@ -219,7 +215,7 @@ int acpi_pci_bind(struct acpi_device *device)
          */
         if (data->dev->subordinate) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Device %02x:%02x:%02x.%02x is a PCI bridge\n",
+                                  "Device %04x:%02x:%02x.%d is a PCI bridge\n",
                                   data->id.segment, data->id.bus,
                                   data->id.device, data->id.function));
                 data->bus = data->dev->subordinate;
@@ -262,7 +258,7 @@ int acpi_pci_bind(struct acpi_device *device)
         }
 
       end:
-        kfree(pathname);
+        kfree(buffer.pointer);
         if (result)
                 kfree(data);
 
@@ -272,25 +268,21 @@ int acpi_pci_bind(struct acpi_device *device)
 static int acpi_pci_unbind(struct acpi_device *device)
 {
         int result = 0;
-        acpi_status status = AE_OK;
-        struct acpi_pci_data *data = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
+        acpi_status status;
+        struct acpi_pci_data *data;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
 
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
 
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Unbinding PCI device [%s]...\n",
-                          pathname));
-        kfree(pathname);
+                          (char *) buffer.pointer));
+        kfree(buffer.pointer);
 
         status =
             acpi_get_data(device->handle, acpi_pci_data_handler,
@@ -322,50 +314,44 @@ acpi_pci_bind_root(struct acpi_device *device,
                    struct acpi_pci_id *id, struct pci_bus *bus)
 {
         int result = 0;
-        acpi_status status = AE_OK;
+        acpi_status status;
         struct acpi_pci_data *data = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
-
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
-
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
         if (!device || !id || !bus) {
-                kfree(pathname);
                 return -EINVAL;
         }
 
         data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-        if (!data) {
-                kfree(pathname);
+        if (!data)
                 return -ENOMEM;
-        }
 
         data->id = *id;
         data->bus = bus;
         device->ops.bind = acpi_pci_bind;
         device->ops.unbind = acpi_pci_unbind;
 
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status)) {
+                kfree (data);
+                return -ENODEV;
+        }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to "
-                          "%02x:%02x\n", pathname, id->segment, id->bus));
+                        "%04x:%02x\n", (char *)buffer.pointer,
+                        id->segment, id->bus));
 
         status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Unable to attach ACPI-PCI context to device %s",
-                                pathname));
+                                (char *)buffer.pointer));
                 result = -ENODEV;
                 goto end;
         }
 
       end:
-        kfree(pathname);
+        kfree(buffer.pointer);
         if (result != 0)
                 kfree(data);
 
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index bf79d83bdfbb..891bdf6679f3 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -4,6 +4,8 @@
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2002       Dominik Brodowski <devel@brodo.de>
+ *  (c) Copyright 2008 Hewlett-Packard Development Company, L.P.
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -41,29 +43,36 @@
 #define _COMPONENT              ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_irq");
 
-static struct acpi_prt_list acpi_prt;
+struct acpi_prt_entry {
+        struct list_head        list;
+        struct acpi_pci_id      id;
+        u8                      pin;
+        acpi_handle             link;
+        u32                     index;          /* GSI, or link _CRS index */
+};
+
+static LIST_HEAD(acpi_prt_list);
 static DEFINE_SPINLOCK(acpi_prt_lock);
 
+static inline char pin_name(int pin)
+{
+        return 'A' + pin - 1;
+}
+
 /* --------------------------------------------------------------------------
                          PCI IRQ Routing Table (PRT) Support
    -------------------------------------------------------------------------- */
 
-static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
-                                                          int bus,
-                                                          int device, int pin)
+static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(struct pci_dev *dev,
+                                                          int pin)
 {
-        struct acpi_prt_entry *entry = NULL;
-
-        if (!acpi_prt.count)
-                return NULL;
+        struct acpi_prt_entry *entry;
+        int segment = pci_domain_nr(dev->bus);
+        int bus = dev->bus->number;
+        int device = PCI_SLOT(dev->devfn);
 
-        /*
-         * Parse through all PRT entries looking for a match on the specified
-         * PCI device's segment, bus, device, and pin (don't care about func).
-         *
-         */
         spin_lock(&acpi_prt_lock);
-        list_for_each_entry(entry, &acpi_prt.entries, node) {
+        list_for_each_entry(entry, &acpi_prt_list, list) {
                 if ((segment == entry->id.segment)
                     && (bus == entry->id.bus)
                     && (device == entry->id.device)
@@ -72,7 +81,6 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
                         return entry;
                 }
         }
-
         spin_unlock(&acpi_prt_lock);
         return NULL;
 }
@@ -124,25 +132,27 @@ struct prt_quirk {
         char                    *actual_source;
 };
 
+#define PCI_INTX_PIN(c)         (c - 'A' + 1)
+
 /*
  * These systems have incorrect _PRT entries.  The BIOS claims the PCI
  * interrupt at the listed segment/bus/device/pin is connected to the first
  * link device, but it is actually connected to the second.
  */
 static struct prt_quirk prt_quirks[] = {
-        { medion_md9580, 0, 0, 9, 'A',
+        { medion_md9580, 0, 0, 9, PCI_INTX_PIN('A'),
                 "\\_SB_.PCI0.ISA_.LNKA",
                 "\\_SB_.PCI0.ISA_.LNKB"},
-        { dell_optiplex, 0, 0, 0xd, 'A',
+        { dell_optiplex, 0, 0, 0xd, PCI_INTX_PIN('A'),
                 "\\_SB_.LNKB",
                 "\\_SB_.LNKA"},
-        { hp_t5710, 0, 0, 1, 'A',
+        { hp_t5710, 0, 0, 1, PCI_INTX_PIN('A'),
                 "\\_SB_.PCI0.LNK1",
                 "\\_SB_.PCI0.LNK3"},
 };
 
-static void
-do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
+static void do_prt_fixups(struct acpi_prt_entry *entry,
+                          struct acpi_pci_routing_table *prt)
 {
         int i;
         struct prt_quirk *quirk;
@@ -158,42 +168,43 @@ do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
                     entry->id.segment == quirk->segment &&
                     entry->id.bus == quirk->bus &&
                     entry->id.device == quirk->device &&
-                    entry->pin + 'A' == quirk->pin &&
+                    entry->pin == quirk->pin &&
                     !strcmp(prt->source, quirk->source) &&
                     strlen(prt->source) >= strlen(quirk->actual_source)) {
                         printk(KERN_WARNING PREFIX "firmware reports "
                                 "%04x:%02x:%02x PCI INT %c connected to %s; "
                                 "changing to %s\n",
                                 entry->id.segment, entry->id.bus,
-                                entry->id.device, 'A' + entry->pin,
+                                entry->id.device, pin_name(entry->pin),
                                 prt->source, quirk->actual_source);
                         strcpy(prt->source, quirk->actual_source);
                 }
         }
 }
 
-static int
-acpi_pci_irq_add_entry(acpi_handle handle,
-                       int segment, int bus, struct acpi_pci_routing_table *prt)
+static int acpi_pci_irq_add_entry(acpi_handle handle, int segment, int bus,
+                                  struct acpi_pci_routing_table *prt)
 {
-        struct acpi_prt_entry *entry = NULL;
-
-
-        if (!prt)
-                return -EINVAL;
+        struct acpi_prt_entry *entry;
 
         entry = kzalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
         if (!entry)
                 return -ENOMEM;
 
+        /*
+         * Note that the _PRT uses 0=INTA, 1=INTB, etc, while PCI uses
+         * 1=INTA, 2=INTB.  We use the PCI encoding throughout, so convert
+         * it here.
+         */
         entry->id.segment = segment;
         entry->id.bus = bus;
         entry->id.device = (prt->address >> 16) & 0xFFFF;
-        entry->id.function = prt->address & 0xFFFF;
-        entry->pin = prt->pin;
+        entry->pin = prt->pin + 1;
 
         do_prt_fixups(entry, prt);
 
+        entry->index = prt->source_index;
+
         /*
          * Type 1: Dynamic
          * ---------------
@@ -207,10 +218,9 @@ acpi_pci_irq_add_entry(acpi_handle handle,
          *       (e.g. exists somewhere 'below' this _PRT entry in the ACPI
          *       namespace).
          */
-        if (prt->source[0]) {
-                acpi_get_handle(handle, prt->source, &entry->link.handle);
-                entry->link.index = prt->source_index;
-        }
+        if (prt->source[0])
+                acpi_get_handle(handle, prt->source, &entry->link);
+
         /*
          * Type 2: Static
          * --------------
@@ -218,84 +228,38 @@ acpi_pci_irq_add_entry(acpi_handle handle,
          * the IRQ value, which is hardwired to specific interrupt inputs on
          * the interrupt controller.
          */
-        else
-                entry->link.index = prt->source_index;
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO,
-                              "      %02X:%02X:%02X[%c] -> %s[%d]\n",
+                              "      %04x:%02x:%02x[%c] -> %s[%d]\n",
                               entry->id.segment, entry->id.bus,
-                              entry->id.device, ('A' + entry->pin), prt->source,
-                              entry->link.index));
+                              entry->id.device, pin_name(entry->pin),
+                              prt->source, entry->index));
 
         spin_lock(&acpi_prt_lock);
-        list_add_tail(&entry->node, &acpi_prt.entries);
-        acpi_prt.count++;
+        list_add_tail(&entry->list, &acpi_prt_list);
         spin_unlock(&acpi_prt_lock);
 
         return 0;
 }
 
-static void
-acpi_pci_irq_del_entry(int segment, int bus, struct acpi_prt_entry *entry)
-{
-        if (segment == entry->id.segment && bus == entry->id.bus) {
-                acpi_prt.count--;
-                list_del(&entry->node);
-                kfree(entry);
-        }
-}
-
 int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
 {
-        acpi_status status = AE_OK;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
-        struct acpi_pci_routing_table *prt = NULL;
-        struct acpi_pci_routing_table *entry = NULL;
-        static int first_time = 1;
-
-
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
-
-        if (first_time) {
-                acpi_prt.count = 0;
-                INIT_LIST_HEAD(&acpi_prt.entries);
-                first_time = 0;
-        }
-
-        /* 
-         * NOTE: We're given a 'handle' to the _PRT object's parent device
-         *       (either a PCI root bridge or PCI-PCI bridge).
-         */
+        acpi_status status;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_pci_routing_table *entry;
 
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
-        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+        /* 'handle' is the _PRT's parent (root bridge or PCI-PCI bridge) */
+        status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
 
         printk(KERN_DEBUG "ACPI: PCI Interrupt Routing Table [%s._PRT]\n",
-               pathname);
+               (char *) buffer.pointer);
 
-        /* 
-         * Evaluate this _PRT and add its entries to our global list (acpi_prt).
-         */
+        kfree(buffer.pointer);
 
-        buffer.length = 0;
+        buffer.length = ACPI_ALLOCATE_BUFFER;
         buffer.pointer = NULL;
-        kfree(pathname);
-        status = acpi_get_irq_routing_table(handle, &buffer);
-        if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRT [%s]",
-                                acpi_format_exception(status)));
-                return -ENODEV;
-        }
-
-        prt = kzalloc(buffer.length, GFP_KERNEL);
-        if (!prt) {
-                return -ENOMEM;
-        }
-        buffer.pointer = prt;
 
         status = acpi_get_irq_routing_table(handle, &buffer);
         if (ACPI_FAILURE(status)) {
@@ -305,36 +269,30 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
                 return -ENODEV;
         }
 
-        entry = prt;
-
+        entry = buffer.pointer;
         while (entry && (entry->length > 0)) {
                 acpi_pci_irq_add_entry(handle, segment, bus, entry);
                 entry = (struct acpi_pci_routing_table *)
                     ((unsigned long)entry + entry->length);
         }
 
-        kfree(prt);
-
+        kfree(buffer.pointer);
         return 0;
 }
 
 void acpi_pci_irq_del_prt(int segment, int bus)
 {
-        struct list_head *node = NULL, *n = NULL;
-        struct acpi_prt_entry *entry = NULL;
-
-        if (!acpi_prt.count) {
-                return;
-        }
+        struct acpi_prt_entry *entry, *tmp;
 
         printk(KERN_DEBUG
-               "ACPI: Delete PCI Interrupt Routing Table for %x:%x\n", segment,
-               bus);
+               "ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",
+               segment, bus);
         spin_lock(&acpi_prt_lock);
-        list_for_each_safe(node, n, &acpi_prt.entries) {
-                entry = list_entry(node, struct acpi_prt_entry, node);
-
-                acpi_pci_irq_del_entry(segment, bus, entry);
+        list_for_each_entry_safe(entry, tmp, &acpi_prt_list, list) {
+                if (segment == entry->id.segment && bus == entry->id.bus) {
+                        list_del(&entry->list);
+                        kfree(entry);
+                }
         }
         spin_unlock(&acpi_prt_lock);
 }
@@ -342,162 +300,26 @@ void acpi_pci_irq_del_prt(int segment, int bus)
 /* --------------------------------------------------------------------------
                           PCI Interrupt Routing Support
    -------------------------------------------------------------------------- */
-typedef int (*irq_lookup_func) (struct acpi_prt_entry *, int *, int *, char **);
-
-static int
-acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
-                      int *triggering, int *polarity, char **link)
-{
-        int irq;
-
-
-        if (entry->link.handle) {
-                irq = acpi_pci_link_allocate_irq(entry->link.handle,
-                                                 entry->link.index, triggering,
-                                                 polarity, link);
-                if (irq < 0) {
-                        printk(KERN_WARNING PREFIX
-                                      "Invalid IRQ link routing entry\n");
-                        return -1;
-                }
-        } else {
-                irq = entry->link.index;
-                *triggering = ACPI_LEVEL_SENSITIVE;
-                *polarity = ACPI_ACTIVE_LOW;
-        }
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found IRQ %d\n", irq));
-        return irq;
-}
-
-static int
-acpi_pci_free_irq(struct acpi_prt_entry *entry,
-                  int *triggering, int *polarity, char **link)
-{
-        int irq;
-
-        if (entry->link.handle) {
-                irq = acpi_pci_link_free_irq(entry->link.handle);
-        } else {
-                irq = entry->link.index;
-        }
-        return irq;
-}
-
-#ifdef CONFIG_X86_IO_APIC
-extern int noioapicquirk;
-
-static int bridge_has_boot_interrupt_variant(struct pci_bus *bus)
+static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
 {
-        struct pci_bus *bus_it;
-
-        for (bus_it = bus ; bus_it ; bus_it = bus_it->parent) {
-                if (!bus_it->self)
-                        return 0;
-
-                printk(KERN_INFO "vendor=%04x device=%04x\n", bus_it->self->vendor,
-                                bus_it->self->device);
-
-                if (bus_it->self->irq_reroute_variant)
-                        return bus_it->self->irq_reroute_variant;
-        }
-        return 0;
-}
-#endif /* CONFIG_X86_IO_APIC */
-
-/*
- * acpi_pci_irq_lookup
- * success: return IRQ >= 0
- * failure: return -1
- */
-static int
-acpi_pci_irq_lookup(struct pci_bus *bus,
-                    int device,
-                    int pin,
-                    int *triggering,
-                    int *polarity, char **link, irq_lookup_func func)
-{
-        struct acpi_prt_entry *entry = NULL;
-        int segment = pci_domain_nr(bus);
-        int bus_nr = bus->number;
-        int ret;
-
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Searching for PRT entry for %02x:%02x:%02x[%c]\n",
-                          segment, bus_nr, device, ('A' + pin)));
-
-        entry = acpi_pci_irq_find_prt_entry(segment, bus_nr, device, pin);
-        if (!entry) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "PRT entry not found\n"));
-                return -1;
-        }
-
-        ret = func(entry, triggering, polarity, link);
-
-#ifdef CONFIG_X86_IO_APIC
-        /*
-         * Some chipsets (e.g. intel 6700PXH) generate a legacy INTx when the
-         * IRQ entry in the chipset's IO-APIC is masked (as, e.g. the RT kernel
-         * does during interrupt handling). When this INTx generation cannot be
-         * disabled, we reroute these interrupts to their legacy equivalent to
-         * get rid of spurious interrupts.
-         */
-        if (!noioapicquirk) {
-                switch (bridge_has_boot_interrupt_variant(bus)) {
-                case 0:
-                        /* no rerouting necessary */
-                        break;
-
-                case INTEL_IRQ_REROUTE_VARIANT:
-                        /*
-                         * Remap according to INTx routing table in 6700PXH
-                         * specs, intel order number 302628-002, section
-                         * 2.15.2. Other chipsets (80332, ...) have the same
-                         * mapping and are handled here as well.
-                         */
-                        printk(KERN_INFO "pci irq %d -> rerouted to legacy "
-                                         "irq %d\n", ret, (ret % 4) + 16);
-                        ret = (ret % 4) + 16;
-                        break;
-
-                default:
-                        printk(KERN_INFO "not rerouting irq %d to legacy irq: "
-                                         "unknown mapping\n", ret);
-                        break;
-                }
+        struct acpi_prt_entry *entry;
+        struct pci_dev *bridge;
+        u8 bridge_pin, orig_pin = pin;
+
+        entry = acpi_pci_irq_find_prt_entry(dev, pin);
+        if (entry) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %s[%c] _PRT entry\n",
+                                  pci_name(dev), pin_name(pin)));
+                return entry;
         }
-#endif /* CONFIG_X86_IO_APIC */
-
-        return ret;
-}
-
-/*
- * acpi_pci_irq_derive
- * success: return IRQ >= 0
- * failure: return < 0
- */
-static int
-acpi_pci_irq_derive(struct pci_dev *dev,
-                    int pin,
-                    int *triggering,
-                    int *polarity, char **link, irq_lookup_func func)
-{
-        struct pci_dev *bridge = dev;
-        int irq = -1;
-        u8 bridge_pin = 0, orig_pin = pin;
-
-
-        if (!dev)
-                return -EINVAL;
 
         /* 
          * Attempt to derive an IRQ for this device from a parent bridge's
          * PCI interrupt routing entry (eg. yenta bridge and add-in card bridge).
          */
-        while (irq < 0 && bridge->bus->self) {
-                pin = (pin + PCI_SLOT(bridge->devfn)) % 4;
-                bridge = bridge->bus->self;
+        bridge = dev->bus->self;
+        while (bridge) {
+                pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1;
 
                 if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) {
                         /* PC card has the same IRQ as its cardbridge */
@@ -506,50 +328,40 @@ acpi_pci_irq_derive(struct pci_dev *dev,
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                                   "No interrupt pin configured for device %s\n",
                                                   pci_name(bridge)));
-                                return -1;
+                                return NULL;
                         }
-                        /* Pin is from 0 to 3 */
-                        bridge_pin--;
                         pin = bridge_pin;
                 }
 
-                irq = acpi_pci_irq_lookup(bridge->bus, PCI_SLOT(bridge->devfn),
-                                          pin, triggering, polarity,
-                                          link, func);
-        }
+                entry = acpi_pci_irq_find_prt_entry(bridge, pin);
+                if (entry) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "Derived GSI for %s INT %c from %s\n",
+                                         pci_name(dev), pin_name(orig_pin),
+                                         pci_name(bridge)));
+                        return entry;
+                }
 
-        if (irq < 0) {
-                dev_warn(&dev->dev, "can't derive routing for PCI INT %c\n",
-                         'A' + orig_pin);
-                return -1;
+                dev = bridge;
+                bridge = dev->bus->self;
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Derive IRQ %d for device %s from %s\n",
-                          irq, pci_name(dev), pci_name(bridge)));
-
-        return irq;
+        dev_warn(&dev->dev, "can't derive routing for PCI INT %c\n",
+                 pin_name(orig_pin));
+        return NULL;
 }
 
-/*
- * acpi_pci_irq_enable
- * success: return 0
- * failure: return < 0
- */
-
 int acpi_pci_irq_enable(struct pci_dev *dev)
 {
-        int irq = 0;
-        u8 pin = 0;
+        struct acpi_prt_entry *entry;
+        int gsi;
+        u8 pin;
         int triggering = ACPI_LEVEL_SENSITIVE;
         int polarity = ACPI_ACTIVE_LOW;
         char *link = NULL;
         char link_desc[16];
         int rc;
 
-
-        if (!dev)
-                return -EINVAL;
-
         pin = dev->pin;
         if (!pin) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -557,31 +369,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                                   pci_name(dev)));
                 return 0;
         }
-        pin--;
-
-        if (!dev->bus) {
-                dev_err(&dev->dev, "invalid (NULL) 'bus' field\n");
-                return -ENODEV;
-        }
-
-        /* 
-         * First we check the PCI IRQ routing table (PRT) for an IRQ.  PRT
-         * values override any BIOS-assigned IRQs set during boot.
-         */
-        irq = acpi_pci_irq_lookup(dev->bus, PCI_SLOT(dev->devfn), pin,
-                                  &triggering, &polarity, &link,
-                                  acpi_pci_allocate_irq);
-
-        /*
-         * If no PRT entry was found, we'll try to derive an IRQ from the
-         * device's parent bridge.
-         */
-        if (irq < 0)
-                irq = acpi_pci_irq_derive(dev, pin, &triggering,
-                                          &polarity, &link,
-                                          acpi_pci_allocate_irq);
 
-        if (irq < 0) {
+        entry = acpi_pci_irq_lookup(dev, pin);
+        if (!entry) {
                 /*
                  * IDE legacy mode controller IRQs are magic. Why do compat
                  * extensions always make such a nasty mess.
@@ -590,12 +380,24 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                                 (dev->class & 0x05) == 0)
                         return 0;
         }
+
+        if (entry) {
+                if (entry->link)
+                        gsi = acpi_pci_link_allocate_irq(entry->link,
+                                                         entry->index,
+                                                         &triggering, &polarity,
+                                                         &link);
+                else
+                        gsi = entry->index;
+        } else
+                gsi = -1;
+
         /*
          * No IRQ known to the ACPI subsystem - maybe the BIOS / 
          * driver reported one, then use it. Exit in any case.
          */
-        if (irq < 0) {
-                dev_warn(&dev->dev, "PCI INT %c: no GSI", 'A' + pin);
+        if (gsi < 0) {
+                dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
                 /* Interrupt Line values above 0xF are forbidden */
                 if (dev->irq > 0 && (dev->irq <= 0xF)) {
                         printk(" - using IRQ %d\n", dev->irq);
@@ -608,10 +410,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                 }
         }
 
-        rc = acpi_register_gsi(irq, triggering, polarity);
+        rc = acpi_register_gsi(gsi, triggering, polarity);
         if (rc < 0) {
                 dev_warn(&dev->dev, "PCI INT %c: failed to register GSI\n",
-                         'A' + pin);
+                         pin_name(pin));
                 return rc;
         }
         dev->irq = rc;
@@ -622,7 +424,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                 link_desc[0] = '\0';
 
         dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
-                 'A' + pin, link_desc, irq,
+                 pin_name(pin), link_desc, gsi,
                  (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
                  (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
 
@@ -636,42 +438,28 @@ void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
 
 void acpi_pci_irq_disable(struct pci_dev *dev)
 {
-        int gsi = 0;
-        u8 pin = 0;
-        int triggering = ACPI_LEVEL_SENSITIVE;
-        int polarity = ACPI_ACTIVE_LOW;
-
-
-        if (!dev || !dev->bus)
-                return;
+        struct acpi_prt_entry *entry;
+        int gsi;
+        u8 pin;
 
         pin = dev->pin;
         if (!pin)
                 return;
-        pin--;
 
-        /*
-         * First we check the PCI IRQ routing table (PRT) for an IRQ.
-         */
-        gsi = acpi_pci_irq_lookup(dev->bus, PCI_SLOT(dev->devfn), pin,
-                                  &triggering, &polarity, NULL,
-                                  acpi_pci_free_irq);
-        /*
-         * If no PRT entry was found, we'll try to derive an IRQ from the
-         * device's parent bridge.
-         */
-        if (gsi < 0)
-                gsi = acpi_pci_irq_derive(dev, pin,
-                                          &triggering, &polarity, NULL,
-                                          acpi_pci_free_irq);
-        if (gsi < 0)
+        entry = acpi_pci_irq_lookup(dev, pin);
+        if (!entry)
                 return;
 
+        if (entry->link)
+                gsi = acpi_pci_link_free_irq(entry->link);
+        else
+                gsi = entry->index;
+
         /*
          * TBD: It might be worth clearing dev->irq by magic constant
          * (e.g. PCI_UNDEFINED_IRQ).
          */
 
-        dev_info(&dev->dev, "PCI INT %c disabled\n", 'A' + pin);
+        dev_info(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
         acpi_unregister_gsi(gsi);
 }
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index e52ad91ce2dc..1c6e73c7865e 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -796,10 +796,6 @@ static int irqrouter_resume(struct sys_device *dev)
         struct list_head *node = NULL;
         struct acpi_pci_link *link = NULL;
 
-
-        /* Make sure SCI is enabled again (Apple firmware bug?) */
-        acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
-
         list_for_each(node, &acpi_link.entries) {
                 link = list_entry(node, struct acpi_pci_link, node);
                 if (!link) {
@@ -912,7 +908,7 @@ static int __init acpi_irq_nobalance_set(char *str)
 
 __setup("acpi_irq_nobalance", acpi_irq_nobalance_set);
 
-int __init acpi_irq_balance_set(char *str)
+static int __init acpi_irq_balance_set(char *str)
 {
         acpi_irq_balance = 1;
         return 1;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index bb7d50dd2818..c926e7d4a0d6 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -139,6 +139,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
 {
         acpi_status status = AE_OK;
         unsigned long long sta = 0;
+        char node_name[5];
+        struct acpi_buffer buffer = { sizeof(node_name), node_name };
 
 
         if (!handle || !state)
@@ -151,8 +153,10 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
         *state = (sta & 0x01)?ACPI_POWER_RESOURCE_STATE_ON:
                               ACPI_POWER_RESOURCE_STATE_OFF;
 
+        acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
+
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
-                          acpi_ut_get_node_name(handle),
+                          node_name,
                                 *state ? "on" : "off"));
 
         return 0;
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/proc.c
index 4dbc2271acf5..428c911dba08 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/proc.c
@@ -28,8 +28,6 @@ static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
 {
         int i;
 
-        ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show");
-
         for (i = 0; i <= ACPI_STATE_S5; i++) {
                 if (sleep_states[i]) {
                         seq_printf(seq, "S%d ", i);
@@ -86,49 +84,44 @@ acpi_system_write_sleep(struct file *file,
 
 #ifdef  HAVE_ACPI_LEGACY_ALARM
 
+static u32 cmos_bcd_read(int offset, int rtc_control);
+
 static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
 {
         u32 sec, min, hr;
         u32 day, mo, yr, cent = 0;
+        u32 today = 0;
         unsigned char rtc_control = 0;
         unsigned long flags;
 
-        ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
-
         spin_lock_irqsave(&rtc_lock, flags);
 
-        sec = CMOS_READ(RTC_SECONDS_ALARM);
-        min = CMOS_READ(RTC_MINUTES_ALARM);
-        hr = CMOS_READ(RTC_HOURS_ALARM);
         rtc_control = CMOS_READ(RTC_CONTROL);
+        sec = cmos_bcd_read(RTC_SECONDS_ALARM, rtc_control);
+        min = cmos_bcd_read(RTC_MINUTES_ALARM, rtc_control);
+        hr = cmos_bcd_read(RTC_HOURS_ALARM, rtc_control);
 
         /* If we ever get an FACP with proper values... */
-        if (acpi_gbl_FADT.day_alarm)
+        if (acpi_gbl_FADT.day_alarm) {
                 /* ACPI spec: only low 6 its should be cared */
                 day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F;
-        else
-                day = CMOS_READ(RTC_DAY_OF_MONTH);
+                if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+                        day = bcd2bin(day);
+        } else
+                day = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
         if (acpi_gbl_FADT.month_alarm)
-                mo = CMOS_READ(acpi_gbl_FADT.month_alarm);
-        else
-                mo = CMOS_READ(RTC_MONTH);
+                mo = cmos_bcd_read(acpi_gbl_FADT.month_alarm, rtc_control);
+        else {
+                mo = cmos_bcd_read(RTC_MONTH, rtc_control);
+                today = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
+        }
         if (acpi_gbl_FADT.century)
-                cent = CMOS_READ(acpi_gbl_FADT.century);
+                cent = cmos_bcd_read(acpi_gbl_FADT.century, rtc_control);
 
-        yr = CMOS_READ(RTC_YEAR);
+        yr = cmos_bcd_read(RTC_YEAR, rtc_control);
 
         spin_unlock_irqrestore(&rtc_lock, flags);
 
-        if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                sec = bcd2bin(sec);
-                min = bcd2bin(min);
-                hr = bcd2bin(hr);
-                day = bcd2bin(day);
-                mo = bcd2bin(mo);
-                yr = bcd2bin(yr);
-                cent = bcd2bin(cent);
-        }
-
         /* we're trusting the FADT (see above) */
         if (!acpi_gbl_FADT.century)
                 /* If we're not trusting the FADT, we should at least make it
@@ -153,6 +146,20 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
         else
                 yr += cent * 100;
 
+        /*
+         * Show correct dates for alarms up to a month into the future.
+         * This solves issues for nearly all situations with the common
+         * 30-day alarm clocks in PC hardware.
+         */
+        if (day < today) {
+                if (mo < 12) {
+                        mo += 1;
+                } else {
+                        mo = 1;
+                        yr += 1;
+                }
+        }
+
         seq_printf(seq, "%4.4u-", yr);
         (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo);
         (day > 31) ? seq_puts(seq, "** ") : seq_printf(seq, "%2.2u ", day);
@@ -227,13 +234,11 @@ acpi_system_write_alarm(struct file *file,
         int adjust = 0;
         unsigned char rtc_control = 0;
 
-        ACPI_FUNCTION_TRACE("acpi_system_write_alarm");
-
         if (count > sizeof(alarm_string) - 1)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         if (copy_from_user(alarm_string, buffer, count))
-                return_VALUE(-EFAULT);
+                return -EFAULT;
 
         alarm_string[count] = '\0';
 
@@ -334,7 +339,7 @@ acpi_system_write_alarm(struct file *file,
 
         result = 0;
       end:
-        return_VALUE(result ? result : count);
+        return result ? result : count;
 }
 #endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index a6b662c00b67..93f91142d7ad 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -42,7 +42,7 @@ void acpi_reboot(void)
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
         case ACPI_ADR_SPACE_SYSTEM_IO:
                 printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n");
-                acpi_hw_low_level_write(8, reset_value, rr);
+                acpi_reset();
                 break;
         }
         /* Wait ten seconds */
diff --git a/drivers/acpi/resources/Makefile b/drivers/acpi/resources/Makefile
deleted file mode 100644
index 8de4f69dfa09..000000000000
--- a/drivers/acpi/resources/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
-         rscalc.o  rsirq.o  rsmemory.o  rsutils.o
-
-obj-$(ACPI_FUTURE_USAGE) += rsdump.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index e53e590252c0..0619734895b2 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -10,7 +10,6 @@
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-#include <acpi/actypes.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 39b7233c3485..c54d7b6c4066 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -10,7 +10,6 @@
 #include <linux/kthread.h>
 
 #include <acpi/acpi_drivers.h>
-#include <acpi/acinterp.h>      /* for acpi_ex_eisa_id_to_string() */
 
 #define _COMPONENT              ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("scan");
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep.h
index cfaf8f5b0a14..cfaf8f5b0a14 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep.h
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
deleted file mode 100644
index f1fb888c2d29..000000000000
--- a/drivers/acpi/sleep/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y                                   := wakeup.o
-obj-y                                   += main.o
-obj-$(CONFIG_ACPI_SLEEP)                += proc.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 6e4107f82403..391d0358a592 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -192,65 +192,6 @@ static struct attribute_group interrupt_stats_attr_group = {
 };
 static struct kobj_attribute *counter_attrs;
 
-static int count_num_gpes(void)
-{
-        int count = 0;
-        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
-        struct acpi_gpe_block_info *gpe_block;
-        acpi_cpu_flags flags;
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
-        while (gpe_xrupt_info) {
-                gpe_block = gpe_xrupt_info->gpe_block_list_head;
-                while (gpe_block) {
-                        count += gpe_block->register_count *
-                            ACPI_GPE_REGISTER_WIDTH;
-                        gpe_block = gpe_block->next;
-                }
-                gpe_xrupt_info = gpe_xrupt_info->next;
-        }
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-
-        return count;
-}
-
-static int get_gpe_device(int index, acpi_handle *handle)
-{
-        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
-        struct acpi_gpe_block_info *gpe_block;
-        acpi_cpu_flags flags;
-        struct acpi_namespace_node *node;
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
-        while (gpe_xrupt_info) {
-                gpe_block = gpe_xrupt_info->gpe_block_list_head;
-                node = gpe_block->node;
-                while (gpe_block) {
-                        index -= gpe_block->register_count *
-                            ACPI_GPE_REGISTER_WIDTH;
-                        if (index < 0) {
-                                acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-                                /* return NULL if it's FADT GPE */
-                                if (node->type != ACPI_TYPE_DEVICE)
-                                        *handle = NULL;
-                                else
-                                        *handle = node;
-                                return 0;
-                        }
-                        node = gpe_block->node;
-                        gpe_block = gpe_block->next;
-                }
-                gpe_xrupt_info = gpe_xrupt_info->next;
-        }
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-
-        return -ENODEV;
-}
-
 static void delete_gpe_attr_array(void)
 {
         struct event_counter *tmp = all_counters;
@@ -309,7 +250,7 @@ static int get_status(u32 index, acpi_event_status *status, acpi_handle *handle)
                 goto end;
 
         if (index < num_gpes) {
-                result = get_gpe_device(index, handle);
+                result = acpi_get_gpe_device(index, handle);
                 if (result) {
                         ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
                                 "Invalid GPE 0x%x\n", index));
@@ -436,7 +377,7 @@ void acpi_irq_stats_init(void)
         if (all_counters)
                 return;
 
-        num_gpes = count_num_gpes();
+        num_gpes = acpi_current_gpe_count;
         num_counters = num_gpes + ACPI_NUM_FIXED_EVENTS + NUM_COUNTERS_EXTRA;
 
         all_attrs = kzalloc(sizeof(struct attribute *) * (num_counters + 1),
diff --git a/drivers/acpi/tables/Makefile b/drivers/acpi/tables/Makefile
deleted file mode 100644
index 7385efa61622..000000000000
--- a/drivers/acpi/tables/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/utilities/Makefile b/drivers/acpi/utilities/Makefile
deleted file mode 100644
index 88eff14c4894..000000000000
--- a/drivers/acpi/utilities/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
-                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
-                utstate.o utmutex.o utobject.o utcache.o utresrc.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
deleted file mode 100644
index 245fa80cf600..000000000000
--- a/drivers/acpi/utilities/utcache.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/******************************************************************************
- *
- * Module Name: utcache - local cache allocation routines
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2008, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-
-#define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utcache")
-#ifdef ACPI_USE_LOCAL_CACHE
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_create_cache
- *
- * PARAMETERS:  cache_name      - Ascii name for the cache
- *              object_size     - Size of each cached object
- *              max_depth       - Maximum depth of the cache (in objects)
- *              return_cache    - Where the new cache object is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a cache object
- *
- ******************************************************************************/
-acpi_status
-acpi_os_create_cache(char *cache_name,
-                     u16 object_size,
-                     u16 max_depth, struct acpi_memory_list ** return_cache)
-{
-        struct acpi_memory_list *cache;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache_name || !return_cache || (object_size < 16)) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* Create the cache object */
-
-        cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
-        if (!cache) {
-                return (AE_NO_MEMORY);
-        }
-
-        /* Populate the cache object and return it */
-
-        ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
-        cache->link_offset = 8;
-        cache->list_name = cache_name;
-        cache->object_size = object_size;
-        cache->max_depth = max_depth;
-
-        *return_cache = cache;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_purge_cache
- *
- * PARAMETERS:  Cache           - Handle to cache object
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Free all objects within the requested cache.
- *
- ******************************************************************************/
-
-acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
-{
-        char *next;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* Walk the list of objects in this cache */
-
-        while (cache->list_head) {
-
-                /* Delete and unlink one cached state object */
-
-                next = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                &(((char *)cache->
-                                                   list_head)[cache->
-                                                              link_offset])));
-                ACPI_FREE(cache->list_head);
-
-                cache->list_head = next;
-                cache->current_depth--;
-        }
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_delete_cache
- *
- * PARAMETERS:  Cache           - Handle to cache object
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Free all objects within the requested cache and delete the
- *              cache object.
- *
- ******************************************************************************/
-
-acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Purge all objects in the cache */
-
-        status = acpi_os_purge_cache(cache);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Now we can delete the cache object */
-
-        ACPI_FREE(cache);
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_release_object
- *
- * PARAMETERS:  Cache       - Handle to cache object
- *              Object      - The object to be released
- *
- * RETURN:      None
- *
- * DESCRIPTION: Release an object to the specified cache.  If cache is full,
- *              the object is deleted.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_os_release_object(struct acpi_memory_list * cache, void *object)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (!cache || !object) {
-                return (AE_BAD_PARAMETER);
-        }
-
-        /* If cache is full, just free this object */
-
-        if (cache->current_depth >= cache->max_depth) {
-                ACPI_FREE(object);
-                ACPI_MEM_TRACKING(cache->total_freed++);
-        }
-
-        /* Otherwise put this object back into the cache */
-
-        else {
-                status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
-                }
-
-                /* Mark the object as cached */
-
-                ACPI_MEMSET(object, 0xCA, cache->object_size);
-                ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);
-
-                /* Put the object at the head of the cache list */
-
-                *(ACPI_CAST_INDIRECT_PTR(char,
-                                         &(((char *)object)[cache->
-                                                            link_offset]))) =
-                    cache->list_head;
-                cache->list_head = object;
-                cache->current_depth++;
-
-                (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
-        }
-
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_acquire_object
- *
- * PARAMETERS:  Cache           - Handle to cache object
- *
- * RETURN:      the acquired object.  NULL on error
- *
- * DESCRIPTION: Get an object from the specified cache.  If cache is empty,
- *              the object is allocated.
- *
- ******************************************************************************/
-
-void *acpi_os_acquire_object(struct acpi_memory_list *cache)
-{
-        acpi_status status;
-        void *object;
-
-        ACPI_FUNCTION_NAME(os_acquire_object);
-
-        if (!cache) {
-                return (NULL);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
-        if (ACPI_FAILURE(status)) {
-                return (NULL);
-        }
-
-        ACPI_MEM_TRACKING(cache->requests++);
-
-        /* Check the cache first */
-
-        if (cache->list_head) {
-
-                /* There is an object available, use it */
-
-                object = cache->list_head;
-                cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char,
-                                                            &(((char *)
-                                                               object)[cache->
-                                                                       link_offset])));
-
-                cache->current_depth--;
-
-                ACPI_MEM_TRACKING(cache->hits++);
-                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Object %p from %s cache\n", object,
-                                  cache->list_name));
-
-                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (NULL);
-                }
-
-                /* Clear (zero) the previously used Object */
-
-                ACPI_MEMSET(object, 0, cache->object_size);
-        } else {
-                /* The cache is empty, create a new object */
-
-                ACPI_MEM_TRACKING(cache->total_allocated++);
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-                if ((cache->total_allocated - cache->total_freed) >
-                    cache->max_occupied) {
-                        cache->max_occupied =
-                            cache->total_allocated - cache->total_freed;
-                }
-#endif
-
-                /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
-
-                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
-                if (ACPI_FAILURE(status)) {
-                        return (NULL);
-                }
-
-                object = ACPI_ALLOCATE_ZEROED(cache->object_size);
-                if (!object) {
-                        return (NULL);
-                }
-        }
-
-        return (object);
-}
-#endif                          /* ACPI_USE_LOCAL_CACHE */
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index baa441929720..f261737636da 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -36,6 +36,7 @@
 #include <linux/backlight.h>
 #include <linux/thermal.h>
 #include <linux/video_output.h>
+#include <linux/sort.h>
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_bus.h>
@@ -481,6 +482,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
         int status = AE_OK;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
+        int state;
 
 
         arg0.integer.value = level;
@@ -489,6 +491,10 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
                 status = acpi_evaluate_object(device->dev->handle, "_BCM",
                                               &args, NULL);
         device->brightness->curr = level;
+        for (state = 2; state < device->brightness->count; state++)
+                if (level == device->brightness->levels[state])
+                        device->backlight->props.brightness = state - 2;
+
         return status;
 }
 
@@ -626,6 +632,16 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 }
 
 /*
+ * Simple comparison function used to sort backlight levels.
+ */
+
+static int
+acpi_video_cmp_level(const void *a, const void *b)
+{
+        return *(int *)a - *(int *)b;
+}
+
+/*
  *  Arg:        
  *      device  : video output device (LCD, CRT, ..)
  *
@@ -676,6 +692,10 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                 count++;
         }
 
+        /* don't sort the first two brightness levels */
+        sort(&br->levels[2], count - 2, sizeof(br->levels[2]),
+                acpi_video_cmp_level, NULL);
+
         if (count < 2)
                 goto out_free_levels;
 
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index f022eb6f5637..50e3d2dbf3af 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -234,7 +234,7 @@ EXPORT_SYMBOL(acpi_video_display_switch_support);
  * To force that backlight or display output switching is processed by vendor
  * specific acpi drivers or video.ko driver.
  */
-int __init acpi_backlight(char *str)
+static int __init acpi_backlight(char *str)
 {
         if (str == NULL || *str == '\0')
                 return 1;
@@ -250,7 +250,7 @@ int __init acpi_backlight(char *str)
 }
 __setup("acpi_backlight=", acpi_backlight);
 
-int __init acpi_display_output(char *str)
+static int __init acpi_display_output(char *str)
 {
         if (str == NULL || *str == '\0')
                 return 1;
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/wakeup.c
index dea4c23df764..2d34806d45dd 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -8,7 +8,6 @@
 #include <acpi/acpi_drivers.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <acpi/acevents.h>
 #include "sleep.h"
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
@@ -28,8 +27,6 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state)
 {
         struct list_head *node, *next;
 
-        ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device_prep");
-
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev = container_of(node,
@@ -61,7 +58,6 @@ void acpi_enable_wakeup_device(u8 sleep_state)
          * Caution: this routine must be invoked when interrupt is disabled 
          * Refer ACPI2.0: P212
          */
-        ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device");
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
@@ -103,8 +99,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 {
         struct list_head *node, *next;
 
-        ACPI_FUNCTION_TRACE("acpi_disable_wakeup_device");
-
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index ef02e488d468..6273d98d00eb 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -19,12 +19,6 @@
 #include "libata.h"
 
 #include <acpi/acpi_bus.h>
-#include <acpi/acnames.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acexcep.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
 
 enum {
         ATA_ACPI_FILTER_SETXFER = 1 << 0,
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index e2e332d8ff95..8b77a9802df1 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -13,12 +13,6 @@
 #include <linux/device.h>
 #include <scsi/scsi_host.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/acnames.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acexcep.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
 
 #include <linux/libata.h>
 #include <linux/ata.h>
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index 68f052b42ed7..ed306eb1057f 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -23,8 +23,6 @@
 #include <linux/security.h>
 #include <linux/module.h>
 #include <acpi/acpi.h>
-#include <acpi/actypes.h>
-#include <acpi/actbl.h>
 #include "tpm.h"
 
 #define TCG_EVENT_NAME_LEN_MAX  255
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 8d7cf3f31450..f1df59f59a37 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -15,12 +15,14 @@
 #include <linux/tick.h>
 
 #define BREAK_FUZZ      4       /* 4 us */
+#define PRED_HISTORY_PCT        50
 
 struct menu_device {
         int             last_state_idx;
 
         unsigned int    expected_us;
         unsigned int    predicted_us;
+        unsigned int    current_predicted_us;
         unsigned int    last_measured_us;
         unsigned int    elapsed_us;
 };
@@ -47,6 +49,12 @@ static int menu_select(struct cpuidle_device *dev)
         data->expected_us =
                 (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
 
+        /* Recalculate predicted_us based on prediction_history_pct */
+        data->predicted_us *= PRED_HISTORY_PCT;
+        data->predicted_us += (100 - PRED_HISTORY_PCT) *
+                                data->current_predicted_us;
+        data->predicted_us /= 100;
+
         /* find the deepest idle state that satisfies our constraints */
         for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
                 struct cpuidle_state *s = &dev->states[i];
@@ -97,7 +105,7 @@ static void menu_reflect(struct cpuidle_device *dev)
                 measured_us = -1;
 
         /* Predict time until next break event */
-        data->predicted_us = max(measured_us, data->last_measured_us);
+        data->current_predicted_us = max(measured_us, data->last_measured_us);
 
         if (last_idle_us + BREAK_FUZZ <
             data->expected_us - target->exit_latency) {
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 2f9e941968d6..d8f295bdad76 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -18,12 +18,6 @@
 #include <linux/dmi.h>
 
 #include <acpi/acpi_bus.h>
-#include <acpi/acnames.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acexcep.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
 
 #define REGS_PER_GTF            7
 struct taskfile_array {
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 3949a1c73451..419c378bd24b 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -120,7 +120,7 @@ config TIFM_CORE
           cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
           Interface support (MMC_TIFM_SD)'.
 
-          To compile this driver as a module, choose M here: the module will
+          To compile this driver as a module, choose M here: the module will
           be called tifm_core.
 
 config TIFM_7XX1
@@ -133,100 +133,9 @@ config TIFM_7XX1
           To make actual use of the device, you will have to select some
           flash card format drivers, as outlined in the TIFM_CORE Help.
 
-          To compile this driver as a module, choose M here: the module will
+          To compile this driver as a module, choose M here: the module will
           be called tifm_7xx1.
 
-config ACER_WMI
-        tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
-        depends on X86
-        depends on EXPERIMENTAL
-        depends on ACPI
-        depends on LEDS_CLASS
-        depends on NEW_LEDS
-        depends on BACKLIGHT_CLASS_DEVICE
-        depends on SERIO_I8042
-        depends on RFKILL
-        select ACPI_WMI
-        ---help---
-          This is a driver for newer Acer (and Wistron) laptops. It adds
-          wireless radio and bluetooth control, and on some laptops,
-          exposes the mail LED and LCD backlight.
-
-          For more information about this driver see
-          <file:Documentation/laptops/acer-wmi.txt>
-
-          If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
-          here.
-
-config ASUS_LAPTOP
-        tristate "Asus Laptop Extras (EXPERIMENTAL)"
-        depends on X86
-        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
-          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
-          standard ACPI events that go through /proc/acpi/events. It also adds
-          support for video output switching, LCD backlight control, Bluetooth and
-          Wlan control, and most importantly, allows you to blink those fancy LEDs.
-
-          For more information and a userspace daemon for handling the extra
-          buttons see <http://acpi4asus.sf.net/>.
-
-          If you have an ACPI-compatible ASUS laptop, say Y or M here.
-
-config FUJITSU_LAPTOP
-        tristate "Fujitsu Laptop Extras"
-        depends on X86
-        depends on ACPI
-        depends on INPUT
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This is a driver for laptops built by Fujitsu:
-
-            * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
-            * Possibly other Fujitsu laptop models
-            * Tested with S6410 and S7020
-
-          It adds support for LCD brightness control and some hotkeys.
-
-          If you have a Fujitsu laptop, say Y or M here.
-
-config FUJITSU_LAPTOP_DEBUG
-        bool "Verbose debug mode for Fujitsu Laptop Extras"
-        depends on FUJITSU_LAPTOP
-        default n
-        ---help---
-          Enables extra debug output from the fujitsu extras driver, at the
-          expense of a slight increase in driver size.
-
-          If you are not sure, say N here.
-
-config TC1100_WMI
-        tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
-        depends on X86 && !X86_64
-        depends on EXPERIMENTAL
-        depends on ACPI
-        select ACPI_WMI
-        ---help---
-          This is a driver for the WMI extensions (wireless and bluetooth power
-          control) of the HP Compaq TC1100 tablet.
-
-config HP_WMI
-       tristate "HP WMI extras"
-       depends on ACPI_WMI
-       depends on INPUT
-       depends on RFKILL
-       help
-         Say Y here if you want to support WMI-based hotkeys on HP laptops and
-         to read data from WMI such as docking or ambient light sensor state.
-
-         To compile this driver as a module, choose M here: the module will
-         be called hp-wmi.
-
 config ICS932S401
         tristate "Integrated Circuits ICS932S401"
         depends on I2C && EXPERIMENTAL
@@ -237,170 +146,6 @@ config ICS932S401
           This driver can also be built as a module. If so, the module
           will be called ics932s401.
 
-config MSI_LAPTOP
-        tristate "MSI Laptop Extras"
-        depends on X86
-        depends on ACPI
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This is a driver for laptops built by MSI (MICRO-STAR
-          INTERNATIONAL):
-
-          MSI MegaBook S270 (MS-1013)
-          Cytron/TCM/Medion/Tchibo MD96100/SAM2000
-
-          It adds support for Bluetooth, WLAN and LCD brightness control.
-
-          More information about this driver is available at
-          <http://0pointer.de/lennart/tchibo.html>.
-
-          If you have an MSI S270 laptop, say Y or M here.
-
-config PANASONIC_LAPTOP
-        tristate "Panasonic Laptop Extras"
-        depends on X86 && INPUT && ACPI
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This driver adds support for access to backlight control and hotkeys
-          on Panasonic Let's Note laptops.
-
-          If you have a Panasonic Let's note laptop (such as the R1(N variant),
-          R2, R3, R5, T2, W2 and Y2 series), say Y.
-
-config COMPAL_LAPTOP
-        tristate "Compal Laptop Extras"
-        depends on X86
-        depends on ACPI
-        depends on BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This is a driver for laptops built by Compal:
-
-          Compal FL90/IFL90
-          Compal FL91/IFL91
-          Compal FL92/JFL92
-          Compal FT00/IFT00
-
-          It adds support for Bluetooth, WLAN and LCD brightness control.
-
-          If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
-
-config SONY_LAPTOP
-        tristate "Sony Laptop Extras"
-        depends on X86 && ACPI
-        select BACKLIGHT_CLASS_DEVICE
-        depends on INPUT
-          ---help---
-          This mini-driver drives the SNC and SPIC devices present in the ACPI
-          BIOS of the Sony Vaio laptops.
-
-          It gives access to some extra laptop functionalities like Bluetooth,
-          screen brightness control, Fn keys and allows powering on/off some
-          devices.
-
-          Read <file:Documentation/laptops/sony-laptop.txt> for more information.
-
-config SONYPI_COMPAT
-        bool "Sonypi compatibility"
-        depends on SONY_LAPTOP
-          ---help---
-          Build the sonypi driver compatibility code into the sony-laptop driver.
-
-config THINKPAD_ACPI
-        tristate "ThinkPad ACPI Laptop Extras"
-        depends on X86 && ACPI
-        select BACKLIGHT_LCD_SUPPORT
-        select BACKLIGHT_CLASS_DEVICE
-        select HWMON
-        select NVRAM
-        select INPUT
-        select NEW_LEDS
-        select LEDS_CLASS
-        select NET
-        select RFKILL
-        ---help---
-          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
-          support for Fn-Fx key combinations, Bluetooth control, video
-          output switching, ThinkLight control, UltraBay eject and more.
-          For more information about this driver see
-          <file:Documentation/laptops/thinkpad-acpi.txt> and
-          <http://ibm-acpi.sf.net/> .
-
-          This driver was formerly known as ibm-acpi.
-
-          If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
-
-config THINKPAD_ACPI_DEBUG
-        bool "Verbose debug mode"
-        depends on THINKPAD_ACPI
-        default n
-        ---help---
-          Enables extra debugging information, at the expense of a slightly
-          increase in driver size.
-
-          If you are not sure, say N here.
-
-config THINKPAD_ACPI_DOCK
-        bool "Legacy Docking Station Support"
-        depends on THINKPAD_ACPI
-        depends on ACPI_DOCK=n
-        default n
-        ---help---
-          Allows the thinkpad_acpi driver to handle docking station events.
-          This support was made obsolete by the generic ACPI docking station
-          support (CONFIG_ACPI_DOCK).  It will allow locking and removing the
-          laptop from the docking station, but will not properly connect PCI
-          devices.
-
-          If you are not sure, say N here.
-
-config THINKPAD_ACPI_BAY
-        bool "Legacy Removable Bay Support"
-        depends on THINKPAD_ACPI
-        default y
-        ---help---
-          Allows the thinkpad_acpi driver to handle removable bays.  It will
-          electrically disable the device in the bay, and also generate
-          notifications when the bay lever is ejected or inserted.
-
-          If you are not sure, say Y here.
-
-config THINKPAD_ACPI_VIDEO
-        bool "Video output control support"
-        depends on THINKPAD_ACPI
-        default y
-        ---help---
-          Allows the thinkpad_acpi driver to provide an interface to control
-          the various video output ports.
-
-          This feature often won't work well, depending on ThinkPad model,
-          display state, video output devices in use, whether there is a X
-          server running, phase of the moon, and the current mood of
-          Schroedinger's cat.  If you can use X.org's RandR to control
-          your ThinkPad's video output ports instead of this feature,
-          don't think twice: do it and say N here to save some memory.
-
-          If you are not sure, say Y here.
-
-config THINKPAD_ACPI_HOTKEY_POLL
-        bool "Support NVRAM polling for hot keys"
-        depends on THINKPAD_ACPI
-        default y
-        ---help---
-          Some thinkpad models benefit from NVRAM polling to detect a few of
-          the hot key press events.  If you know your ThinkPad model does not
-          need to do NVRAM polling to support any of the hot keys you use,
-          unselecting this option will save about 1kB of memory.
-
-          ThinkPads T40 and newer, R52 and newer, and X31 and newer are
-          unlikely to need NVRAM polling in their latest BIOS versions.
-
-          NVRAM polling can detect at most the following keys: ThinkPad/Access
-          IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
-          Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
-
-          If you are not sure, say Y here.  The driver enables polling only if
-          it is strictly necessary to do so.
-
 config ATMEL_SSC
         tristate "Device driver for Atmel SSC peripheral"
         depends on AVR32 || ARCH_AT91
@@ -413,31 +158,6 @@ config ATMEL_SSC
 
           If unsure, say N.
 
-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
-          Intel Menlow platform.
-
-          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
-        depends on RFKILL
-        ---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 5de863a0e395..9cf8ae6e4b39 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,33 +1,20 @@
 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
-obj- := misc.o  # Dummy rule to force built-in.o to be made
 
 obj-$(CONFIG_IBM_ASM)           += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
-obj-$(CONFIG_ASUS_LAPTOP)       += asus-laptop.o
-obj-$(CONFIG_EEEPC_LAPTOP)      += eeepc-laptop.o
-obj-$(CONFIG_MSI_LAPTOP)        += msi-laptop.o
-obj-$(CONFIG_COMPAL_LAPTOP)     += compal-laptop.o
-obj-$(CONFIG_ACER_WMI)          += acer-wmi.o
 obj-$(CONFIG_ATMEL_PWM)         += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)         += atmel-ssc.o
 obj-$(CONFIG_ATMEL_TCLIB)       += atmel_tclib.o
-obj-$(CONFIG_HP_WMI)            += hp-wmi.o
 obj-$(CONFIG_ICS932S401)        += ics932s401.o
-obj-$(CONFIG_TC1100_WMI)        += tc1100-wmi.o
 obj-$(CONFIG_LKDTM)             += lkdtm.o
 obj-$(CONFIG_TIFM_CORE)         += tifm_core.o
 obj-$(CONFIG_DELL_LAPTOP)       += dell-laptop.o
 obj-$(CONFIG_TIFM_7XX1)         += tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)           += phantom.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
-obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
-obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
-obj-$(CONFIG_FUJITSU_LAPTOP)    += fujitsu-laptop.o
-obj-$(CONFIG_PANASONIC_LAPTOP)  += panasonic-laptop.o
 obj-$(CONFIG_EEPROM_93CX6)      += eeprom_93cx6.o
-obj-$(CONFIG_INTEL_MENLOW)      += intel_menlow.o
 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KGDB_TESTS)        += kgdbts.o
 obj-$(CONFIG_SGI_XP)            += sgi-xp/
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index c62ab8d240aa..1c1141801060 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -33,7 +33,6 @@
 #include <linux/pci-acpi.h>
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
 
 #define MY_NAME "acpi_pcihp"
 
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 27fd18f019f8..db85284ffb62 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -217,7 +217,6 @@ struct hpc_ops {
 #ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
 #include <linux/pci-acpi.h>
 
 extern void __init pciehp_acpi_slot_detection_init(void);
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 3582512e7226..deea8a187eb8 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -13,8 +13,6 @@
 #include <linux/module.h>
 #include <linux/pci-aspm.h>
 #include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acresrc.h>
 #include <acpi/acpi_bus.h>
 
 #include <linux/pci-acpi.h>
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
new file mode 100644
index 000000000000..9652c3fe7f5e
--- /dev/null
+++ b/drivers/platform/Kconfig
@@ -0,0 +1,5 @@
+# drivers/platform/Kconfig
+
+if X86
+source "drivers/platform/x86/Kconfig"
+endif
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
new file mode 100644
index 000000000000..782953ae4c03
--- /dev/null
+++ b/drivers/platform/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for linux/drivers/platform
+#
+
+obj-$(CONFIG_X86)               += x86/
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
new file mode 100644
index 000000000000..e65448e99b48
--- /dev/null
+++ b/drivers/platform/x86/Kconfig
@@ -0,0 +1,375 @@
+#
+# X86 Platform Specific Drivers
+#
+
+menuconfig X86_PLATFORM_DEVICES
+        bool "X86 Platform Specific Device Drivers"
+        default y
+        ---help---
+          Say Y here to get to see options for device drivers for various
+          x86 platforms, including vendor-specific laptop extension drivers.
+          This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
+
+if X86_PLATFORM_DEVICES
+
+config ACER_WMI
+        tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on ACPI
+        depends on LEDS_CLASS
+        depends on NEW_LEDS
+        depends on BACKLIGHT_CLASS_DEVICE
+        depends on SERIO_I8042
+        depends on RFKILL
+        select ACPI_WMI
+        ---help---
+          This is a driver for newer Acer (and Wistron) laptops. It adds
+          wireless radio and bluetooth control, and on some laptops,
+          exposes the mail LED and LCD backlight.
+
+          For more information about this driver see
+          <file:Documentation/laptops/acer-wmi.txt>
+
+          If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
+          here.
+
+config ASUS_LAPTOP
+        tristate "Asus Laptop Extras (EXPERIMENTAL)"
+        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
+          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
+          standard ACPI events that go through /proc/acpi/events. It also adds
+          support for video output switching, LCD backlight control, Bluetooth and
+          Wlan control, and most importantly, allows you to blink those fancy LEDs.
+
+          For more information and a userspace daemon for handling the extra
+          buttons see <http://acpi4asus.sf.net/>.
+
+          If you have an ACPI-compatible ASUS laptop, say Y or M here.
+
+config FUJITSU_LAPTOP
+        tristate "Fujitsu Laptop Extras"
+        depends on ACPI
+        depends on INPUT
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This is a driver for laptops built by Fujitsu:
+
+            * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
+            * Possibly other Fujitsu laptop models
+            * Tested with S6410 and S7020
+
+          It adds support for LCD brightness control and some hotkeys.
+
+          If you have a Fujitsu laptop, say Y or M here.
+
+config FUJITSU_LAPTOP_DEBUG
+        bool "Verbose debug mode for Fujitsu Laptop Extras"
+        depends on FUJITSU_LAPTOP
+        default n
+        ---help---
+          Enables extra debug output from the fujitsu extras driver, at the
+          expense of a slight increase in driver size.
+
+          If you are not sure, say N here.
+
+config TC1100_WMI
+        tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
+        depends on !X86_64
+        depends on EXPERIMENTAL
+        depends on ACPI
+        select ACPI_WMI
+        ---help---
+          This is a driver for the WMI extensions (wireless and bluetooth power
+          control) of the HP Compaq TC1100 tablet.
+
+config HP_WMI
+        tristate "HP WMI extras"
+        depends on ACPI_WMI
+        depends on INPUT
+        depends on RFKILL
+        help
+         Say Y here if you want to support WMI-based hotkeys on HP laptops and
+         to read data from WMI such as docking or ambient light sensor state.
+
+         To compile this driver as a module, choose M here: the module will
+         be called hp-wmi.
+
+config MSI_LAPTOP
+        tristate "MSI Laptop Extras"
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This is a driver for laptops built by MSI (MICRO-STAR
+          INTERNATIONAL):
+
+          MSI MegaBook S270 (MS-1013)
+          Cytron/TCM/Medion/Tchibo MD96100/SAM2000
+
+          It adds support for Bluetooth, WLAN and LCD brightness control.
+
+          More information about this driver is available at
+          <http://0pointer.de/lennart/tchibo.html>.
+
+          If you have an MSI S270 laptop, say Y or M here.
+
+config PANASONIC_LAPTOP
+        tristate "Panasonic Laptop Extras"
+        depends on INPUT && ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This driver adds support for access to backlight control and hotkeys
+          on Panasonic Let's Note laptops.
+
+          If you have a Panasonic Let's note laptop (such as the R1(N variant),
+          R2, R3, R5, T2, W2 and Y2 series), say Y.
+
+config COMPAL_LAPTOP
+        tristate "Compal Laptop Extras"
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This is a driver for laptops built by Compal:
+
+          Compal FL90/IFL90
+          Compal FL91/IFL91
+          Compal FL92/JFL92
+          Compal FT00/IFT00
+
+          It adds support for Bluetooth, WLAN and LCD brightness control.
+
+          If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
+
+config SONY_LAPTOP
+        tristate "Sony Laptop Extras"
+        depends on ACPI
+        select BACKLIGHT_CLASS_DEVICE
+        depends on INPUT
+          ---help---
+          This mini-driver drives the SNC and SPIC devices present in the ACPI
+          BIOS of the Sony Vaio laptops.
+
+          It gives access to some extra laptop functionalities like Bluetooth,
+          screen brightness control, Fn keys and allows powering on/off some
+          devices.
+
+          Read <file:Documentation/laptops/sony-laptop.txt> for more information.
+
+config SONYPI_COMPAT
+        bool "Sonypi compatibility"
+        depends on SONY_LAPTOP
+          ---help---
+          Build the sonypi driver compatibility code into the sony-laptop driver.
+
+config THINKPAD_ACPI
+        tristate "ThinkPad ACPI Laptop Extras"
+        depends on ACPI
+        select BACKLIGHT_LCD_SUPPORT
+        select BACKLIGHT_CLASS_DEVICE
+        select HWMON
+        select NVRAM
+        select INPUT
+        select NEW_LEDS
+        select LEDS_CLASS
+        select NET
+        select RFKILL
+        ---help---
+          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
+          support for Fn-Fx key combinations, Bluetooth control, video
+          output switching, ThinkLight control, UltraBay eject and more.
+          For more information about this driver see
+          <file:Documentation/laptops/thinkpad-acpi.txt> and
+          <http://ibm-acpi.sf.net/> .
+
+          This driver was formerly known as ibm-acpi.
+
+          If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
+
+config THINKPAD_ACPI_DEBUG
+        bool "Verbose debug mode"
+        depends on THINKPAD_ACPI
+        default n
+        ---help---
+          Enables extra debugging information, at the expense of a slightly
+          increase in driver size.
+
+          If you are not sure, say N here.
+
+config THINKPAD_ACPI_DOCK
+        bool "Legacy Docking Station Support"
+        depends on THINKPAD_ACPI
+        depends on ACPI_DOCK=n
+        default n
+        ---help---
+          Allows the thinkpad_acpi driver to handle docking station events.
+          This support was made obsolete by the generic ACPI docking station
+          support (CONFIG_ACPI_DOCK).  It will allow locking and removing the
+          laptop from the docking station, but will not properly connect PCI
+          devices.
+
+          If you are not sure, say N here.
+
+config THINKPAD_ACPI_BAY
+        bool "Legacy Removable Bay Support"
+        depends on THINKPAD_ACPI
+        default y
+        ---help---
+          Allows the thinkpad_acpi driver to handle removable bays.  It will
+          electrically disable the device in the bay, and also generate
+          notifications when the bay lever is ejected or inserted.
+
+          If you are not sure, say Y here.
+
+config THINKPAD_ACPI_VIDEO
+        bool "Video output control support"
+        depends on THINKPAD_ACPI
+        default y
+        ---help---
+          Allows the thinkpad_acpi driver to provide an interface to control
+          the various video output ports.
+
+          This feature often won't work well, depending on ThinkPad model,
+          display state, video output devices in use, whether there is a X
+          server running, phase of the moon, and the current mood of
+          Schroedinger's cat.  If you can use X.org's RandR to control
+          your ThinkPad's video output ports instead of this feature,
+          don't think twice: do it and say N here to save some memory.
+
+          If you are not sure, say Y here.
+
+config THINKPAD_ACPI_HOTKEY_POLL
+        bool "Support NVRAM polling for hot keys"
+        depends on THINKPAD_ACPI
+        default y
+        ---help---
+          Some thinkpad models benefit from NVRAM polling to detect a few of
+          the hot key press events.  If you know your ThinkPad model does not
+          need to do NVRAM polling to support any of the hot keys you use,
+          unselecting this option will save about 1kB of memory.
+
+          ThinkPads T40 and newer, R52 and newer, and X31 and newer are
+          unlikely to need NVRAM polling in their latest BIOS versions.
+
+          NVRAM polling can detect at most the following keys: ThinkPad/Access
+          IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
+          Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
+
+          If you are not sure, say Y here.  The driver enables polling only if
+          it is strictly necessary to do so.
+
+config INTEL_MENLOW
+        tristate "Thermal Management driver for Intel menlow platform"
+        depends on ACPI_THERMAL
+        select THERMAL
+        ---help---
+          ACPI thermal management enhancement driver on
+          Intel Menlow platform.
+
+          If unsure, say N.
+
+config EEEPC_LAPTOP
+        tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
+        depends on ACPI
+        depends on EXPERIMENTAL
+        select BACKLIGHT_CLASS_DEVICE
+        select HWMON
+        select RFKILL
+        ---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 ACPI_WMI
+        tristate "WMI (EXPERIMENTAL)"
+        depends on ACPI
+        depends on EXPERIMENTAL
+        help
+          This driver adds support for the ACPI-WMI (Windows Management
+          Instrumentation) mapper device (PNP0C14) found on some systems.
+
+          ACPI-WMI is a proprietary extension to ACPI to expose parts of the
+          ACPI firmware to userspace - this is done through various vendor
+          defined methods and data blocks in a PNP0C14 device, which are then
+          made available for userspace to call.
+
+          The implementation of this in Linux currently only exposes this to
+          other kernel space drivers.
+
+          This driver is a required dependency to build the firmware specific
+          drivers needed on many machines, including Acer and HP laptops.
+
+          It is safe to enable this driver even if your DSDT doesn't define
+          any ACPI-WMI devices.
+
+config ACPI_ASUS
+        tristate "ASUS/Medion Laptop Extras"
+        depends on ACPI
+        select BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This driver provides support for extra features of ACPI-compatible
+          ASUS laptops. As some of Medion laptops are made by ASUS, it may also
+          support some Medion laptops (such as 9675 for example).  It makes all
+          the extra buttons generate standard ACPI events that go through
+          /proc/acpi/events, and (on some models) adds support for changing the
+          display brightness and output, switching the LCD backlight on and off,
+          and most importantly, allows you to blink those fancy LEDs intended
+          for reporting mail and wireless status.
+
+          Note: display switching code is currently considered EXPERIMENTAL,
+          toying with these values may even lock your machine.
+
+          All settings are changed via /proc/acpi/asus directory entries. Owner
+          and group for these entries can be set with asus_uid and asus_gid
+          parameters.
+
+          More information and a userspace daemon for handling the extra buttons
+          at <http://sourceforge.net/projects/acpi4asus/>.
+
+          If you have an ACPI-compatible ASUS laptop, say Y or M here. This
+          driver is still under development, so if your laptop is unsupported or
+          something works not quite as expected, please use the mailing list
+          available on the above page (acpi4asus-user@lists.sourceforge.net).
+
+          NOTE: This driver is deprecated and will probably be removed soon,
+          use asus-laptop instead.
+
+config ACPI_TOSHIBA
+        tristate "Toshiba Laptop Extras"
+        depends on ACPI
+        depends on INPUT
+        select INPUT_POLLDEV
+        select NET
+        select RFKILL
+        select BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This driver adds support for access to certain system settings
+          on "legacy free" Toshiba laptops.  These laptops can be recognized by
+          their lack of a BIOS setup menu and APM support.
+
+          On these machines, all system configuration is handled through the
+          ACPI.  This driver is required for access to controls not covered
+          by the general ACPI drivers, such as LCD brightness, video output,
+          etc.
+
+          This driver differs from the non-ACPI Toshiba laptop driver (located
+          under "Processor type and features") in several aspects.
+          Configuration is accessed by reading and writing text files in the
+          /proc tree instead of by program interface to /dev.  Furthermore, no
+          power management functions are exposed, as those are handled by the
+          general ACPI drivers.
+
+          More information about this driver is available at
+          <http://memebeam.org/toys/ToshibaAcpiDriver>.
+
+          If you have a legacy free Toshiba laptop (such as the Libretto L1
+          series), say Y.
+endif # X86_PLATFORM_DEVICES
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
new file mode 100644
index 000000000000..1e9de2ae0de5
--- /dev/null
+++ b/drivers/platform/x86/Makefile
@@ -0,0 +1,19 @@
+#
+# Makefile for linux/drivers/platform/x86
+# x86 Platform-Specific Drivers
+#
+obj-$(CONFIG_ASUS_LAPTOP)       += asus-laptop.o
+obj-$(CONFIG_EEEPC_LAPTOP)      += eeepc-laptop.o
+obj-$(CONFIG_MSI_LAPTOP)        += msi-laptop.o
+obj-$(CONFIG_COMPAL_LAPTOP)     += compal-laptop.o
+obj-$(CONFIG_ACER_WMI)          += acer-wmi.o
+obj-$(CONFIG_HP_WMI)            += hp-wmi.o
+obj-$(CONFIG_TC1100_WMI)        += tc1100-wmi.o
+obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
+obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
+obj-$(CONFIG_FUJITSU_LAPTOP)    += fujitsu-laptop.o
+obj-$(CONFIG_PANASONIC_LAPTOP)  += panasonic-laptop.o
+obj-$(CONFIG_INTEL_MENLOW)      += intel_menlow.o
+obj-$(CONFIG_ACPI_WMI)          += wmi.o
+obj-$(CONFIG_ACPI_ASUS)         += asus_acpi.o
+obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
diff --git a/drivers/misc/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 94c9f911824e..94c9f911824e 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
diff --git a/drivers/misc/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 8fb8b3591048..8fb8b3591048 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
diff --git a/drivers/acpi/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1e74988c7b2d..1e74988c7b2d 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
diff --git a/drivers/misc/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 11003bba10d3..11003bba10d3 100644
--- a/drivers/misc/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 02fe2b8b8939..02fe2b8b8939 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index a7dd3e9fb79d..65dc41540c62 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -3,6 +3,7 @@
 /*
   Copyright (C) 2007,2008 Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
   Copyright (C) 2008 Peter Gruber <nokos@gmx.net>
+  Copyright (C) 2008 Tony Vroon <tony@linx.net>
   Based on earlier work:
     Copyright (C) 2003 Shane Spencer <shane@bogomip.com>
     Adrian Yee <brewt-fujitsu@brewt.org>
@@ -65,8 +66,11 @@
 #include <linux/kfifo.h>
 #include <linux/video_output.h>
 #include <linux/platform_device.h>
+#ifdef CONFIG_LEDS_CLASS
+#include <linux/leds.h>
+#endif
 
-#define FUJITSU_DRIVER_VERSION "0.4.3"
+#define FUJITSU_DRIVER_VERSION "0.5.0"
 
 #define FUJITSU_LCD_N_LEVELS 8
 
@@ -83,6 +87,24 @@
 #define ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS     0x86
 #define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS     0x87
 
+/* FUNC interface - command values */
+#define FUNC_RFKILL     0x1000
+#define FUNC_LEDS       0x1001
+#define FUNC_BUTTONS    0x1002
+#define FUNC_BACKLIGHT  0x1004
+
+/* FUNC interface - responses */
+#define UNSUPPORTED_CMD 0x80000000
+
+#ifdef CONFIG_LEDS_CLASS
+/* FUNC interface - LED control */
+#define FUNC_LED_OFF    0x1
+#define FUNC_LED_ON     0x30001
+#define KEYBOARD_LAMPS  0x100
+#define LOGOLAMP_POWERON 0x2000
+#define LOGOLAMP_ALWAYS  0x4000
+#endif
+
 /* Hotkey details */
 #define KEY1_CODE       0x410   /* codes for the keys in the GIRB register */
 #define KEY2_CODE       0x411
@@ -133,7 +155,6 @@ struct fujitsu_t {
 
 static struct fujitsu_t *fujitsu;
 static int use_alt_lcd_levels = -1;
-static int disable_brightness_keys = -1;
 static int disable_brightness_adjust = -1;
 
 /* Device used to access other hotkeys on the laptop */
@@ -145,8 +166,9 @@ struct fujitsu_hotkey_t {
         struct platform_device *pf_device;
         struct kfifo *fifo;
         spinlock_t fifo_lock;
-
-        unsigned int irb;       /* info about the pressed buttons */
+        int rfkill_state;
+        int logolamp_registered;
+        int kblamps_registered;
 };
 
 static struct fujitsu_hotkey_t *fujitsu_hotkey;
@@ -154,12 +176,139 @@ static struct fujitsu_hotkey_t *fujitsu_hotkey;
 static void acpi_fujitsu_hotkey_notify(acpi_handle handle, u32 event,
                                        void *data);
 
+#ifdef CONFIG_LEDS_CLASS
+static enum led_brightness logolamp_get(struct led_classdev *cdev);
+static void logolamp_set(struct led_classdev *cdev,
+                               enum led_brightness brightness);
+
+struct led_classdev logolamp_led = {
+ .name = "fujitsu::logolamp",
+ .brightness_get = logolamp_get,
+ .brightness_set = logolamp_set
+};
+
+static enum led_brightness kblamps_get(struct led_classdev *cdev);
+static void kblamps_set(struct led_classdev *cdev,
+                               enum led_brightness brightness);
+
+struct led_classdev kblamps_led = {
+ .name = "fujitsu::kblamps",
+ .brightness_get = kblamps_get,
+ .brightness_set = kblamps_set
+};
+#endif
+
 #ifdef CONFIG_FUJITSU_LAPTOP_DEBUG
 static u32 dbg_level = 0x03;
 #endif
 
 static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data);
 
+/* Fujitsu ACPI interface function */
+
+static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
+{
+        acpi_status status = AE_OK;
+        union acpi_object params[4] = {
+        { .type = ACPI_TYPE_INTEGER },
+        { .type = ACPI_TYPE_INTEGER },
+        { .type = ACPI_TYPE_INTEGER },
+        { .type = ACPI_TYPE_INTEGER }
+        };
+        struct acpi_object_list arg_list = { 4, &params[0] };
+        struct acpi_buffer output;
+        union acpi_object out_obj;
+        acpi_handle handle = NULL;
+
+        status = acpi_get_handle(fujitsu_hotkey->acpi_handle, "FUNC", &handle);
+        if (ACPI_FAILURE(status)) {
+                vdbg_printk(FUJLAPTOP_DBG_ERROR,
+                                "FUNC interface is not present\n");
+                return -ENODEV;
+        }
+
+        params[0].integer.value = cmd;
+        params[1].integer.value = arg0;
+        params[2].integer.value = arg1;
+        params[3].integer.value = arg2;
+
+        output.length = sizeof(out_obj);
+        output.pointer = &out_obj;
+
+        status = acpi_evaluate_object(handle, NULL, &arg_list, &output);
+        if (ACPI_FAILURE(status)) {
+                vdbg_printk(FUJLAPTOP_DBG_WARN,
+                        "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) call failed\n",
+                                cmd, arg0, arg1, arg2);
+                return -ENODEV;
+        }
+
+        if (out_obj.type != ACPI_TYPE_INTEGER) {
+                vdbg_printk(FUJLAPTOP_DBG_WARN,
+                        "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) did not "
+                        "return an integer\n",
+                        cmd, arg0, arg1, arg2);
+                return -ENODEV;
+        }
+
+        vdbg_printk(FUJLAPTOP_DBG_TRACE,
+                "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) returned 0x%x\n",
+                        cmd, arg0, arg1, arg2, (int)out_obj.integer.value);
+        return out_obj.integer.value;
+}
+
+#ifdef CONFIG_LEDS_CLASS
+/* LED class callbacks */
+
+static void logolamp_set(struct led_classdev *cdev,
+                               enum led_brightness brightness)
+{
+        if (brightness >= LED_FULL) {
+                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
+                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);
+        } else if (brightness >= LED_HALF) {
+                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
+                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);
+        } else {
+                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);
+        }
+}
+
+static void kblamps_set(struct led_classdev *cdev,
+                               enum led_brightness brightness)
+{
+        if (brightness >= LED_FULL)
+                call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_ON);
+        else
+                call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_OFF);
+}
+
+static enum led_brightness logolamp_get(struct led_classdev *cdev)
+{
+        enum led_brightness brightness = LED_OFF;
+        int poweron, always;
+
+        poweron = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_POWERON, 0x0);
+        if (poweron == FUNC_LED_ON) {
+                brightness = LED_HALF;
+                always = call_fext_func(FUNC_LEDS, 0x2, LOGOLAMP_ALWAYS, 0x0);
+                if (always == FUNC_LED_ON)
+                        brightness = LED_FULL;
+        }
+        return brightness;
+}
+
+static enum led_brightness kblamps_get(struct led_classdev *cdev)
+{
+        enum led_brightness brightness = LED_OFF;
+
+        if (call_fext_func(FUNC_LEDS, 0x2, KEYBOARD_LAMPS, 0x0) == FUNC_LED_ON)
+                brightness = LED_FULL;
+
+        return brightness;
+}
+#endif
+
 /* Hardware access for LCD brightness control */
 
 static int set_lcd_level(int level)
@@ -263,44 +412,34 @@ static int get_max_brightness(void)
         return fujitsu->max_brightness;
 }
 
-static int get_lcd_level_alt(void)
-{
-        unsigned long long state = 0;
-        acpi_status status = AE_OK;
-
-        vdbg_printk(FUJLAPTOP_DBG_TRACE, "get lcd level via GBLS\n");
-
-        status =
-            acpi_evaluate_integer(fujitsu->acpi_handle, "GBLS", NULL, &state);
-        if (status < 0)
-                return status;
-
-        fujitsu->brightness_level = state & 0x0fffffff;
-
-        if (state & 0x80000000)
-                fujitsu->brightness_changed = 1;
-        else
-                fujitsu->brightness_changed = 0;
-
-        return fujitsu->brightness_level;
-}
-
 /* Backlight device stuff */
 
 static int bl_get_brightness(struct backlight_device *b)
 {
-        if (use_alt_lcd_levels)
-                return get_lcd_level_alt();
-        else
-                return get_lcd_level();
+        return get_lcd_level();
 }
 
 static int bl_update_status(struct backlight_device *b)
 {
+        int ret;
+        if (b->props.power == 4)
+                ret = call_fext_func(FUNC_BACKLIGHT, 0x1, 0x4, 0x3);
+        else
+                ret = call_fext_func(FUNC_BACKLIGHT, 0x1, 0x4, 0x0);
+        if (ret != 0)
+                vdbg_printk(FUJLAPTOP_DBG_ERROR,
+                        "Unable to adjust backlight power, error code %i\n",
+                        ret);
+
         if (use_alt_lcd_levels)
-                return set_lcd_level_alt(b->props.brightness);
+                ret = set_lcd_level_alt(b->props.brightness);
         else
-                return set_lcd_level(b->props.brightness);
+                ret = set_lcd_level(b->props.brightness);
+        if (ret != 0)
+                vdbg_printk(FUJLAPTOP_DBG_ERROR,
+                        "Unable to adjust LCD brightness, error code %i\n",
+                        ret);
+        return ret;
 }
 
 static struct backlight_ops fujitsubl_ops = {
@@ -344,10 +483,7 @@ static ssize_t show_lcd_level(struct device *dev,
 
         int ret;
 
-        if (use_alt_lcd_levels)
-                ret = get_lcd_level_alt();
-        else
-                ret = get_lcd_level();
+        ret = get_lcd_level();
         if (ret < 0)
                 return ret;
 
@@ -372,52 +508,71 @@ static ssize_t store_lcd_level(struct device *dev,
         if (ret < 0)
                 return ret;
 
-        if (use_alt_lcd_levels)
-                ret = get_lcd_level_alt();
-        else
-                ret = get_lcd_level();
+        ret = get_lcd_level();
         if (ret < 0)
                 return ret;
 
         return count;
 }
 
-/* Hardware access for hotkey device */
-
-static int get_irb(void)
+static ssize_t
+ignore_store(struct device *dev,
+             struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long long state = 0;
-        acpi_status status = AE_OK;
-
-        vdbg_printk(FUJLAPTOP_DBG_TRACE, "Get irb\n");
-
-        status =
-            acpi_evaluate_integer(fujitsu_hotkey->acpi_handle, "GIRB", NULL,
-                                  &state);
-        if (status < 0)
-                return status;
+        return count;
+}
 
-        fujitsu_hotkey->irb = state;
+static ssize_t
+show_lid_state(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+                return sprintf(buf, "unknown\n");
+        if (fujitsu_hotkey->rfkill_state & 0x100)
+                return sprintf(buf, "open\n");
+        else
+                return sprintf(buf, "closed\n");
+}
 
-        return fujitsu_hotkey->irb;
+static ssize_t
+show_dock_state(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+                return sprintf(buf, "unknown\n");
+        if (fujitsu_hotkey->rfkill_state & 0x200)
+                return sprintf(buf, "docked\n");
+        else
+                return sprintf(buf, "undocked\n");
 }
 
 static ssize_t
-ignore_store(struct device *dev,
-             struct device_attribute *attr, const char *buf, size_t count)
+show_radios_state(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return count;
+        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+                return sprintf(buf, "unknown\n");
+        if (fujitsu_hotkey->rfkill_state & 0x20)
+                return sprintf(buf, "on\n");
+        else
+                return sprintf(buf, "killed\n");
 }
 
 static DEVICE_ATTR(max_brightness, 0444, show_max_brightness, ignore_store);
 static DEVICE_ATTR(brightness_changed, 0444, show_brightness_changed,
                    ignore_store);
 static DEVICE_ATTR(lcd_level, 0644, show_lcd_level, store_lcd_level);
+static DEVICE_ATTR(lid, 0444, show_lid_state, ignore_store);
+static DEVICE_ATTR(dock, 0444, show_dock_state, ignore_store);
+static DEVICE_ATTR(radios, 0444, show_radios_state, ignore_store);
 
 static struct attribute *fujitsupf_attributes[] = {
         &dev_attr_brightness_changed.attr,
         &dev_attr_max_brightness.attr,
         &dev_attr_lcd_level.attr,
+        &dev_attr_lid.attr,
+        &dev_attr_dock.attr,
+        &dev_attr_radios.attr,
         NULL
 };
 
@@ -435,24 +590,16 @@ static struct platform_driver fujitsupf_driver = {
 static void dmi_check_cb_common(const struct dmi_system_id *id)
 {
         acpi_handle handle;
-        int have_blnf;
         printk(KERN_INFO "fujitsu-laptop: Identified laptop model '%s'.\n",
                id->ident);
-        have_blnf = ACPI_SUCCESS
-            (acpi_get_handle(NULL, "\\_SB.PCI0.GFX0.LCD.BLNF", &handle));
         if (use_alt_lcd_levels == -1) {
-                vdbg_printk(FUJLAPTOP_DBG_TRACE, "auto-detecting usealt\n");
-                use_alt_lcd_levels = 1;
-        }
-        if (disable_brightness_keys == -1) {
-                vdbg_printk(FUJLAPTOP_DBG_TRACE,
-                            "auto-detecting disable_keys\n");
-                disable_brightness_keys = have_blnf ? 1 : 0;
-        }
-        if (disable_brightness_adjust == -1) {
-                vdbg_printk(FUJLAPTOP_DBG_TRACE,
-                            "auto-detecting disable_adjust\n");
-                disable_brightness_adjust = have_blnf ? 0 : 1;
+                if (ACPI_SUCCESS(acpi_get_handle(NULL,
+                                "\\_SB.PCI0.LPCB.FJEX.SBL2", &handle)))
+                        use_alt_lcd_levels = 1;
+                else
+                        use_alt_lcd_levels = 0;
+                vdbg_printk(FUJLAPTOP_DBG_TRACE, "auto-detected usealt as "
+                        "%i\n", use_alt_lcd_levels);
         }
 }
 
@@ -581,19 +728,14 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
         /* do config (detect defaults) */
         use_alt_lcd_levels = use_alt_lcd_levels == 1 ? 1 : 0;
-        disable_brightness_keys = disable_brightness_keys == 1 ? 1 : 0;
         disable_brightness_adjust = disable_brightness_adjust == 1 ? 1 : 0;
         vdbg_printk(FUJLAPTOP_DBG_INFO,
-                    "config: [alt interface: %d], [key disable: %d], [adjust disable: %d]\n",
-                    use_alt_lcd_levels, disable_brightness_keys,
-                    disable_brightness_adjust);
+                    "config: [alt interface: %d], [adjust disable: %d]\n",
+                    use_alt_lcd_levels, disable_brightness_adjust);
 
         if (get_max_brightness() <= 0)
                 fujitsu->max_brightness = FUJITSU_LCD_N_LEVELS;
-        if (use_alt_lcd_levels)
-                get_lcd_level_alt();
-        else
-                get_lcd_level();
+        get_lcd_level();
 
         return result;
 
@@ -644,43 +786,23 @@ static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data)
         case ACPI_FUJITSU_NOTIFY_CODE1:
                 keycode = 0;
                 oldb = fujitsu->brightness_level;
-                get_lcd_level();  /* the alt version always yields changed */
+                get_lcd_level();
                 newb = fujitsu->brightness_level;
 
                 vdbg_printk(FUJLAPTOP_DBG_TRACE,
                             "brightness button event [%i -> %i (%i)]\n",
                             oldb, newb, fujitsu->brightness_changed);
 
-                if (oldb == newb && fujitsu->brightness_changed) {
-                        keycode = 0;
-                        if (disable_brightness_keys != 1) {
-                                if (oldb == 0) {
-                                        acpi_bus_generate_proc_event
-                                            (fujitsu->dev,
-                                             ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS,
-                                             0);
-                                        keycode = KEY_BRIGHTNESSDOWN;
-                                } else if (oldb ==
-                                           (fujitsu->max_brightness) - 1) {
-                                        acpi_bus_generate_proc_event
-                                            (fujitsu->dev,
-                                             ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS,
-                                             0);
-                                        keycode = KEY_BRIGHTNESSUP;
-                                }
-                        }
-                } else if (oldb < newb) {
+                if (oldb < newb) {
                         if (disable_brightness_adjust != 1) {
                                 if (use_alt_lcd_levels)
                                         set_lcd_level_alt(newb);
                                 else
                                         set_lcd_level(newb);
                         }
-                        if (disable_brightness_keys != 1) {
-                                acpi_bus_generate_proc_event(fujitsu->dev,
-                                        ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS, 0);
-                                keycode = KEY_BRIGHTNESSUP;
-                        }
+                        acpi_bus_generate_proc_event(fujitsu->dev,
+                                ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS, 0);
+                        keycode = KEY_BRIGHTNESSUP;
                 } else if (oldb > newb) {
                         if (disable_brightness_adjust != 1) {
                                 if (use_alt_lcd_levels)
@@ -688,13 +810,9 @@ static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data)
                                 else
                                         set_lcd_level(newb);
                         }
-                        if (disable_brightness_keys != 1) {
-                                acpi_bus_generate_proc_event(fujitsu->dev,
-                                        ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS, 0);
-                                keycode = KEY_BRIGHTNESSDOWN;
-                        }
-                } else {
-                        keycode = KEY_UNKNOWN;
+                        acpi_bus_generate_proc_event(fujitsu->dev,
+                                ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS, 0);
+                        keycode = KEY_BRIGHTNESSDOWN;
                 }
                 break;
         default:
@@ -771,7 +889,8 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
         input->id.bustype = BUS_HOST;
         input->id.product = 0x06;
         input->dev.parent = &device->dev;
-        input->evbit[0] = BIT(EV_KEY);
+
+        set_bit(EV_KEY, input->evbit);
         set_bit(fujitsu->keycode1, input->keybit);
         set_bit(fujitsu->keycode2, input->keybit);
         set_bit(fujitsu->keycode3, input->keybit);
@@ -803,10 +922,44 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
                         printk(KERN_ERR "_INI Method failed\n");
         }
 
-        i = 0;                  /* Discard hotkey ringbuffer */
-        while (get_irb() != 0 && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE) ;
+        i = 0;
+        while (call_fext_func(FUNC_BUTTONS, 0x1, 0x0, 0x0) != 0
+                && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE)
+                ; /* No action, result is discarded */
         vdbg_printk(FUJLAPTOP_DBG_INFO, "Discarded %i ringbuffer entries\n", i);
 
+        fujitsu_hotkey->rfkill_state =
+                call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
+
+        /* Suspect this is a keymap of the application panel, print it */
+        printk(KERN_INFO "fujitsu-laptop: BTNI: [0x%x]\n",
+                call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0));
+
+        #ifdef CONFIG_LEDS_CLASS
+        if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
+                result = led_classdev_register(&fujitsu->pf_device->dev,
+                                                &logolamp_led);
+                if (result == 0) {
+                        fujitsu_hotkey->logolamp_registered = 1;
+                } else {
+                        printk(KERN_ERR "fujitsu-laptop: Could not register "
+                        "LED handler for logo lamp, error %i\n", result);
+                }
+        }
+
+        if ((call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) &&
+           (call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) {
+                result = led_classdev_register(&fujitsu->pf_device->dev,
+                                                &kblamps_led);
+                if (result == 0) {
+                        fujitsu_hotkey->kblamps_registered = 1;
+                } else {
+                        printk(KERN_ERR "fujitsu-laptop: Could not register "
+                        "LED handler for keyboard lamps, error %i\n", result);
+                }
+        }
+        #endif
+
         return result;
 
 end:
@@ -852,16 +1005,15 @@ static void acpi_fujitsu_hotkey_notify(acpi_handle handle, u32 event,
 
         input = fujitsu_hotkey->input;
 
-        vdbg_printk(FUJLAPTOP_DBG_TRACE, "Hotkey event\n");
+        fujitsu_hotkey->rfkill_state =
+                call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
 
         switch (event) {
         case ACPI_FUJITSU_NOTIFY_CODE1:
                 i = 0;
-                while ((irb = get_irb()) != 0
-                       && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE) {
-                        vdbg_printk(FUJLAPTOP_DBG_TRACE, "GIRB result [%x]\n",
-                                    irb);
-
+                while ((irb =
+                        call_fext_func(FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0
+                                && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE) {
                         switch (irb & 0x4ff) {
                         case KEY1_CODE:
                                 keycode = fujitsu->keycode1;
@@ -1035,6 +1187,15 @@ static int __init fujitsu_init(void)
                 goto fail_hotkey1;
         }
 
+        /* Sync backlight power status (needs FUJ02E3 device, hence deferred) */
+
+        if (!acpi_video_backlight_support()) {
+                if (call_fext_func(FUNC_BACKLIGHT, 0x2, 0x4, 0x0) == 3)
+                        fujitsu->bl_device->props.power = 4;
+                else
+                        fujitsu->bl_device->props.power = 0;
+        }
+
         printk(KERN_INFO "fujitsu-laptop: driver " FUJITSU_DRIVER_VERSION
                " successfully loaded.\n");
 
@@ -1074,6 +1235,14 @@ fail_acpi:
 
 static void __exit fujitsu_cleanup(void)
 {
+        #ifdef CONFIG_LEDS_CLASS
+        if (fujitsu_hotkey->logolamp_registered != 0)
+                led_classdev_unregister(&logolamp_led);
+
+        if (fujitsu_hotkey->kblamps_registered != 0)
+                led_classdev_unregister(&kblamps_led);
+        #endif
+
         sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
                            &fujitsupf_attribute_group);
         platform_device_unregister(fujitsu->pf_device);
@@ -1098,9 +1267,6 @@ module_exit(fujitsu_cleanup);
 module_param(use_alt_lcd_levels, uint, 0644);
 MODULE_PARM_DESC(use_alt_lcd_levels,
                  "Use alternative interface for lcd_levels (needed for Lifebook s6410).");
-module_param(disable_brightness_keys, uint, 0644);
-MODULE_PARM_DESC(disable_brightness_keys,
-                 "Disable brightness keys (eg. if they are already handled by the generic ACPI_VIDEO device).");
 module_param(disable_brightness_adjust, uint, 0644);
 MODULE_PARM_DESC(disable_brightness_adjust, "Disable brightness adjustment .");
 #ifdef CONFIG_FUJITSU_LAPTOP_DEBUG
@@ -1108,12 +1274,13 @@ module_param_named(debug, dbg_level, uint, 0644);
 MODULE_PARM_DESC(debug, "Sets debug level bit-mask");
 #endif
 
-MODULE_AUTHOR("Jonathan Woithe, Peter Gruber");
+MODULE_AUTHOR("Jonathan Woithe, Peter Gruber, Tony Vroon");
 MODULE_DESCRIPTION("Fujitsu laptop extras support");
 MODULE_VERSION(FUJITSU_DRIVER_VERSION);
 MODULE_LICENSE("GPL");
 
 MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*");
+MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*");
 MODULE_ALIAS("dmi:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*");
 
 static struct pnp_device_id pnp_ids[] = {
diff --git a/drivers/misc/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 4b7c24c519c3..4b7c24c519c3 100644
--- a/drivers/misc/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
diff --git a/drivers/misc/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 27b7662955bb..27b7662955bb 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
diff --git a/drivers/misc/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 759763d18e4c..759763d18e4c 100644
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 4a1bc64485d5..f30db367c82e 100644
--- a/drivers/misc/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -241,8 +241,6 @@ static int acpi_pcc_write_sset(struct pcc_acpi *pcc, int func, int val)
         };
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_write_sset");
-
         status = acpi_evaluate_object(pcc->handle, METHOD_HKEY_SSET,
                                       &params, NULL);
 
@@ -254,8 +252,6 @@ static inline int acpi_pcc_get_sqty(struct acpi_device *device)
         unsigned long long s;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_get_sqty");
-
         status = acpi_evaluate_integer(device->handle, METHOD_HKEY_SQTY,
                                        NULL, &s);
         if (ACPI_SUCCESS(status))
@@ -274,8 +270,6 @@ static int acpi_pcc_retrieve_biosdata(struct pcc_acpi *pcc, u32 *sinf)
         union acpi_object *hkey = NULL;
         int i;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_retrieve_biosdata");
-
         status = acpi_evaluate_object(pcc->handle, METHOD_HKEY_SINF, 0,
                                       &buffer);
         if (ACPI_FAILURE(status)) {
@@ -501,8 +495,6 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
         int key_code, hkey_num;
         unsigned long long result;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_generate_keyinput");
-
         rc = acpi_evaluate_integer(pcc->handle, METHOD_HKEY_QUERY,
                                    NULL, &result);
         if (!ACPI_SUCCESS(rc)) {
@@ -538,8 +530,6 @@ static void acpi_pcc_hotkey_notify(acpi_handle handle, u32 event, void *data)
 {
         struct pcc_acpi *pcc = (struct pcc_acpi *) data;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_hotkey_notify");
-
         switch (event) {
         case HKEY_NOTIFY:
                 acpi_pcc_generate_keyinput(pcc);
@@ -554,8 +544,6 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc)
 {
         int i, rc;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_init_input");
-
         pcc->input_dev = input_allocate_device();
         if (!pcc->input_dev) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@ -597,8 +585,6 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)
         struct pcc_acpi *pcc = acpi_driver_data(device);
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_hotkey_resume");
-
         if (device == NULL || pcc == NULL)
                 return -EINVAL;
 
@@ -616,8 +602,6 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
         struct pcc_acpi *pcc;
         int num_sifr, result;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_hotkey_add");
-
         if (!device)
                 return -EINVAL;
 
@@ -714,8 +698,6 @@ static int __init acpi_pcc_init(void)
 {
         int result = 0;
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_init");
-
         if (acpi_disabled)
                 return -ENODEV;
 
@@ -733,8 +715,6 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type)
 {
         struct pcc_acpi *pcc = acpi_driver_data(device);
 
-        ACPI_FUNCTION_TRACE("acpi_pcc_hotkey_remove");
-
         if (!device || !pcc)
                 return -EINVAL;
 
@@ -757,8 +737,6 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type)
 
 static void __exit acpi_pcc_exit(void)
 {
-        ACPI_FUNCTION_TRACE("acpi_pcc_exit");
-
         acpi_bus_unregister_driver(&acpi_pcc_driver);
 }
 
diff --git a/drivers/misc/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 571b211608d1..537959d07148 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -935,14 +935,17 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
 static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
                                       void *context, void **return_value)
 {
-        struct acpi_namespace_node *node;
-        union acpi_operand_object *operand;
+        struct acpi_device_info *info;
+        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
 
-        node = (struct acpi_namespace_node *)handle;
-        operand = (union acpi_operand_object *)node->object;
+        if (ACPI_SUCCESS(acpi_get_object_info(handle, &buffer))) {
+                info = buffer.pointer;
 
-        printk(KERN_WARNING DRV_PFX "method: name: %4.4s, args %X\n", node->name.ascii,
-               (u32) operand->method.param_count);
+                printk(KERN_WARNING DRV_PFX "method: name: %4.4s, args %X\n",
+                        (char *)&info->name, info->param_count);
+
+                kfree(buffer.pointer);
+        }
 
         return AE_OK;
 }
diff --git a/drivers/misc/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index f25e4c974dcf..b4a4aa9ee482 100644
--- a/drivers/misc/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <acpi/acpi.h>
-#include <acpi/actypes.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/platform_device.h>
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 899766e16fa8..3478453eba7a 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -76,7 +76,6 @@
 #include <linux/workqueue.h>
 
 #include <acpi/acpi_drivers.h>
-#include <acpi/acnamesp.h>
 
 #include <linux/pci_ids.h>
 
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 40e60fc2e596..40e60fc2e596 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
diff --git a/drivers/acpi/wmi.c b/drivers/platform/x86/wmi.c
index 8a8b377712c9..8a8b377712c9 100644
--- a/drivers/acpi/wmi.c
+++ b/drivers/platform/x86/wmi.c
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 383e47c392a4..2834846a185d 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -23,7 +23,6 @@
 #include <linux/pnp.h>
 #include <linux/mod_devicetable.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
 
 #include "../base.h"
 #include "pnpacpi.h"