Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
  ACPI: processor: use .notify method instead of installing handler directly
  ACPI: button: use .notify method instead of installing handler directly
  ACPI: support acpi_device_ops .notify methods
  toshiba-acpi: remove MAINTAINERS entry
  ACPI: battery: asynchronous init
  acer-wmi: Update copyright notice & documentation
  acer-wmi: Cleanup the failure cleanup handling
  acer-wmi: Blacklist Acer Aspire One
  video: build fix
  thinkpad-acpi: rework brightness support
  thinkpad-acpi: enhanced debugging messages for the fan subdriver
  thinkpad-acpi: enhanced debugging messages for the hotkey subdriver
  thinkpad-acpi: enhanced debugging messages for rfkill subdrivers
  thinkpad-acpi: restrict access to some firmware LEDs
  thinkpad-acpi: remove HKEY disable functionality
  thinkpad-acpi: add new debug helpers and warn of deprecated atts
  thinkpad-acpi: add missing log levels
  thinkpad-acpi: cleanup debug helpers
  thinkpad-acpi: documentation cleanup
  thinkpad-acpi: drop ibm-acpi alias
  ...

1 files changed, 45 insertions, 1 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3a0d8ef25c75..d440ccd27d91 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -131,6 +131,21 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
 #endif                          /* ACPI_DEBUG_OUTPUT */
                 break;
 
+        case ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY:
+#ifdef ACPI_DEBUG_OUTPUT
+                {
+                        struct acpi_srat_x2apic_cpu_affinity *p =
+                            (struct acpi_srat_x2apic_cpu_affinity *)header;
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "SRAT Processor (x2apicid[0x%08x]) in"
+                                          " proximity domain %d %s\n",
+                                          p->apic_id,
+                                          p->proximity_domain,
+                                          (p->flags & ACPI_SRAT_CPU_ENABLED) ?
+                                          "enabled" : "disabled"));
+                }
+#endif                          /* ACPI_DEBUG_OUTPUT */
+                break;
         default:
                 printk(KERN_WARNING PREFIX
                        "Found unsupported SRAT entry (type = 0x%x)\n",
@@ -180,8 +195,35 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
         return 0;
 }
 
+void __init __attribute__ ((weak))
+acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
+{
+        printk(KERN_WARNING PREFIX
+               "Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
+        return;
+}
+
+
+static int __init
+acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
+                           const unsigned long end)
+{
+        struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
+
+        processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
+        if (!processor_affinity)
+                return -EINVAL;
+
+        acpi_table_print_srat_entry(header);
+
+        /* let architecture-dependent part to do it */
+        acpi_numa_x2apic_affinity_init(processor_affinity);
+
+        return 0;
+}
+
 static int __init
-acpi_parse_processor_affinity(struct acpi_subtable_header * header,
+acpi_parse_processor_affinity(struct acpi_subtable_header *header,
                               const unsigned long end)
 {
         struct acpi_srat_cpu_affinity *processor_affinity;
@@ -241,6 +283,8 @@ int __init acpi_numa_init(void)
 {
         /* SRAT: Static Resource Affinity Table */
         if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
+                acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
+                                      acpi_parse_x2apic_affinity, NR_CPUS);
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
                                       acpi_parse_processor_affinity, NR_CPUS);
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,