4 files changed, 25 insertions, 16 deletions

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 40f856c0f108..1fea8ae7db6d 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -63,7 +63,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20060823
+#define ACPI_CA_VERSION                 0x20060828
 
 /*
  * OS name, used for the _OS object.  The _OS object is essentially obsolete,
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index 0f12fecba637..a870484eaa03 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -227,6 +227,16 @@ struct acpi_table_desc {
         u8 flags;
 };
 
+/* Flags for above */
+
+#define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
+#define ACPI_TABLE_ORIGIN_MAPPED        (1)
+#define ACPI_TABLE_ORIGIN_ALLOCATED     (2)
+#define ACPI_TABLE_ORIGIN_MASK          (3)
+#define ACPI_TABLE_IS_LOADED            (4)
+
+/* One internal RSDT for table management */
+
 struct acpi_internal_rsdt {
         struct acpi_table_desc *tables;
         u32 count;
@@ -234,14 +244,11 @@ struct acpi_internal_rsdt {
         u8 flags;
 };
 
-/* Flags for both structs above */
+/* Flags for above */
 
-#define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
-#define ACPI_TABLE_ORIGIN_MAPPED        (1)
-#define ACPI_TABLE_ORIGIN_ALLOCATED     (2)
-#define ACPI_TABLE_ORIGIN_MASK          (3)
-#define ACPI_TABLE_FLAGS_LOADED         (4)
-#define ACPI_TABLE_FLAGS_ALLOW_RESIZE   (8)
+#define ACPI_ROOT_ORIGIN_UNKNOWN        (0)     /* ~ORIGIN_ALLOCATED */
+#define ACPI_ROOT_ORIGIN_ALLOCATED      (1)
+#define ACPI_ROOT_ALLOW_RESIZE          (2)
 
 /* Predefined (fixed) table indexes */
 
diff --git a/include/acpi/actables.h b/include/acpi/actables.h
index 1737a2f045f6..9183de1a10f2 100644
--- a/include/acpi/actables.h
+++ b/include/acpi/actables.h
@@ -94,9 +94,11 @@ acpi_tb_print_table_header(acpi_physical_address address,
 
 u8 acpi_tb_checksum(u8 * buffer, acpi_native_uint length);
 
-void acpi_tb_convert_fadt(struct acpi_table_fadt *fadt);
+acpi_status
+acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length);
 
-acpi_status acpi_tb_parse_root_table(struct acpi_table_rsdp *rsdp, u8 flags);
+acpi_status
+acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags);
 
 void *acpi_tb_map(acpi_physical_address address, u32 length, u32 flags);
 
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index b455f540a165..c55939e344a0 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -199,8 +199,8 @@ struct acpi_table_fadt {
         u32 pm1b_control_block; /* Port address of Power Mgt 1b Control Reg Blk */
         u32 pm2_control_block;  /* Port address of Power Mgt 2 Control Reg Blk */
         u32 pm_timer_block;     /* Port address of Power Mgt Timer Ctrl Reg Blk */
-        u32 gpe0_block;         /* Port addr of General Purpose acpi_event 0 Reg Blk */
-        u32 gpe1_block;         /* Port addr of General Purpose acpi_event 1 Reg Blk */
+        u32 gpe0_block;         /* Port addr of General Purpose Event 0 Reg Blk */
+        u32 gpe1_block;         /* Port addr of General Purpose Event 1 Reg Blk */
         u8 pm1_event_length;    /* Byte Length of ports at pm1_x_evt_blk */
         u8 pm1_control_length;  /* Byte Length of ports at pm1_x_cnt_blk */
         u8 pm2_control_length;  /* Byte Length of ports at pm2_cnt_blk */
@@ -226,14 +226,14 @@ struct acpi_table_fadt {
         u8 reserved4[3];        /* These three bytes must be zero */
         u64 Xfacs;              /* 64-bit physical address of FACS */
         u64 Xdsdt;              /* 64-bit physical address of DSDT */
-        struct acpi_generic_address xpm1a_event_block;  /* Extended Power Mgt 1a acpi_event Reg Blk address */
-        struct acpi_generic_address xpm1b_event_block;  /* Extended Power Mgt 1b acpi_event Reg Blk address */
+        struct acpi_generic_address xpm1a_event_block;  /* Extended Power Mgt 1a Event Reg Blk address */
+        struct acpi_generic_address xpm1b_event_block;  /* Extended Power Mgt 1b Event Reg Blk address */
         struct acpi_generic_address xpm1a_control_block;        /* Extended Power Mgt 1a Control Reg Blk address */
         struct acpi_generic_address xpm1b_control_block;        /* Extended Power Mgt 1b Control Reg Blk address */
         struct acpi_generic_address xpm2_control_block; /* Extended Power Mgt 2 Control Reg Blk address */
         struct acpi_generic_address xpm_timer_block;    /* Extended Power Mgt Timer Ctrl Reg Blk address */
-        struct acpi_generic_address xgpe0_block;        /* Extended General Purpose acpi_event 0 Reg Blk address */
-        struct acpi_generic_address xgpe1_block;        /* Extended General Purpose acpi_event 1 Reg Blk address */
+        struct acpi_generic_address xgpe0_block;        /* Extended General Purpose Event 0 Reg Blk address */
+        struct acpi_generic_address xgpe1_block;        /* Extended General Purpose Event 1 Reg Blk address */
 };
 
 /* FADT flags */