[PATCH] Minor ACPI changes for x86-64

Make CONFIG_ACPI_SLEEP dependent on software suspend (because suspend
is not working yet on x86-64)

Add support for the HPET tables.

diff --git a/drivers/acpi/Config.in b/drivers/acpi/Config.in
index 4be660c2b8d348f8e02365a08b287353166a30bb..5dbeb53a7b239e6b8569cfa5d37b348ba2030c25 100644 (file)
--- a/drivers/acpi/Config.in
+++ b/drivers/acpi/Config.in
@@ -34,6 +34,7 @@ if [ "$CONFIG_X86" = "y" ]; then
          define_bool CONFIG_ACPI_EC y
          define_bool CONFIG_ACPI_POWER y
          define_bool CONFIG_ACPI_PCI $CONFIG_PCI
+         define_bool CONFIG_ACPI_SLEEP $CONFIG_SOFTWARE_SUSPEND
          define_bool CONFIG_ACPI_SYSTEM        y
       fi
    fi

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index dd7f58a86716d867b6026488edcd7e01cffed4f7..14819f3f51c7ab333c62d5d823b98e4a8d4c804b 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -55,7 +55,8 @@ static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
        [ACPI_SPCR]             = "SPCR",
        [ACPI_SRAT]             = "SRAT",
        [ACPI_SSDT]             = "SSDT",
-       [ACPI_SPMI]             = "SPMI"
+       [ACPI_SPMI]             = "SPMI",
+       [ACPI_HPET]             = "HPET"
 };
 
 /* System Description Table (RSDT/XSDT) */
@@ -320,7 +321,7 @@ acpi_table_parse_madt_family (
                        handler(entry);
                }
                entry = (acpi_table_entry_header *)
-                       ((unsigned long) entry += entry->length);
+                       ((unsigned long) entry + entry->length);
        }
 
        return count;

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3cca03f5d6c8c425de84624a9362729c0ed119db..cb30a1c7878a587bf1a2e8c1e145d2eb4e6df43a 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -228,6 +228,26 @@ enum acpi_interrupt_id {
        ACPI_INTERRUPT_COUNT
 };
 
+#define        ACPI_SPACE_MEM          0
+
+struct acpi_gen_regaddr {
+       u8  space_id;
+       u8  bit_width;
+       u8  bit_offset;
+       u8  resv;
+       u32 addrl;
+       u32 addrh;
+} __attribute__ ((packed));
+
+struct acpi_table_hpet {
+       struct acpi_table_header header;
+       u32 id;
+       struct acpi_gen_regaddr addr;
+       u8 number;
+       u16 min_tick;
+       u8 page_protect;
+} __attribute__ ((packed));
+
 /*
  * System Resource Affinity Table (SRAT)
  *   see http://www.microsoft.com/hwdev/design/srat.htm
@@ -333,6 +353,7 @@ enum acpi_table_id {
        ACPI_SRAT,
        ACPI_SSDT,
        ACPI_SPMI,
+       ACPI_HPET,
        ACPI_TABLE_COUNT
 };