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: (112 commits)
  ACPI: fix build warning
  Revert "cpuidle: build fix for non-x86"
  ACPI: update intrd DSDT override console messages
  ACPI: update DSDT override documentation
  ACPI: Add "acpi_no_initrd_override" kernel parameter
  ACPI: its a directory not a folder....
  ACPI: misc cleanups
  ACPI: add missing prink prefix strings
  ACPI: cleanup acpi.h
  ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
  ACPI: video: Ignore ACPI video devices that aren't present in hardware
  ACPI: video: reset brightness on resume
  ACPI: video: call ACPI notifier chain for ACPI video notifications
  ACPI: create notifier chain to get hotkey events to graphics driver
  ACPI: video: delete unused display switch on hotkey event code
  ACPI: video: create "brightness_switch_enabled" modparam
  cpuidle: Add a poll_idle method
  ACPI: cpuidle: Support C1 idle time accounting
  ACPI: enable MWAIT for C1 idle
  ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
  ...

7 files changed, 34 insertions, 67 deletions

diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c
index 5a216c019924..cbe6cee5a550 100644
--- a/arch/ia64/kernel/acpi-processor.c
+++ b/arch/ia64/kernel/acpi-processor.c
@@ -45,6 +45,12 @@ static void init_intel_pdc(struct acpi_processor *pr)
         buf[0] = ACPI_PDC_REVISION_ID;
         buf[1] = 1;
         buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;
+        /*
+         * The default of PDC_SMP_T_SWCOORD bit is set for IA64 cpu so
+         * that OSPM is capable of native ACPI throttling software
+         * coordination using BIOS supplied _TSD info.
+         */
+        buf[2] |= ACPI_PDC_SMP_T_SWCOORD;
 
         obj->type = ACPI_TYPE_BUFFER;
         obj->buffer.length = 12;
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 00b5d08f6da8..78f28d825f30 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -69,6 +69,20 @@ unsigned int acpi_cpei_phys_cpuid;
 
 unsigned long acpi_wakeup_address = 0;
 
+#ifdef CONFIG_IA64_GENERIC
+static unsigned long __init acpi_find_rsdp(void)
+{
+        unsigned long rsdp_phys = 0;
+
+        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                rsdp_phys = efi.acpi20;
+        else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                printk(KERN_WARNING PREFIX
+                       "v1.0/r0.71 tables no longer supported\n");
+        return rsdp_phys;
+}
+#endif
+
 const char __init *
 acpi_get_sysname(void)
 {
@@ -152,7 +166,7 @@ int acpi_request_vector(u32 int_type)
         return vector;
 }
 
-char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
 {
         return __va(phys_addr);
 }
@@ -601,8 +615,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
                                      IOSAPIC_LEVEL);
 }
 
-EXPORT_SYMBOL(acpi_register_gsi);
-
 void acpi_unregister_gsi(u32 gsi)
 {
         if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
@@ -611,8 +623,6 @@ void acpi_unregister_gsi(u32 gsi)
         iosapic_unregister_intr(gsi);
 }
 
-EXPORT_SYMBOL(acpi_unregister_gsi);
-
 static int __init acpi_parse_fadt(struct acpi_table_header *table)
 {
         struct acpi_table_header *fadt_header;
@@ -631,18 +641,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
         return 0;
 }
 
-unsigned long __init acpi_find_rsdp(void)
-{
-        unsigned long rsdp_phys = 0;
-
-        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
-                rsdp_phys = efi.acpi20;
-        else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
-                printk(KERN_WARNING PREFIX
-                       "v1.0/r0.71 tables no longer supported\n");
-        return rsdp_phys;
-}
-
 int __init acpi_boot_init(void)
 {
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 923c3babd667..c95482b6b6dd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -105,6 +105,9 @@ config GENERIC_TIME_VSYSCALL
         bool
         default X86_64
 
+config ARCH_HAS_CPU_RELAX
+        def_bool y
+
 config HAVE_SETUP_PER_CPU_AREA
         def_bool X86_64
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d2a58431a074..680b7300a489 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1;	/* enable HT */
 int acpi_lapic;
 int acpi_ioapic;
 int acpi_strict;
-EXPORT_SYMBOL(acpi_strict);
 
 u8 acpi_sci_flags __initdata;
 int acpi_sci_override_gsi __initdata;
@@ -106,7 +105,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
 #ifdef  CONFIG_X86_64
 
 /* rely on all ACPI tables being in the direct mapping */
-char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
 {
         if (!phys_addr || !size)
                 return NULL;
@@ -131,7 +130,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
  * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and
  * count idx down while incrementing the phys address.
  */
-char *__acpi_map_table(unsigned long phys, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 {
         unsigned long base, offset, mapped_size;
         int idx;
@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
         return irq;
 }
 
-EXPORT_SYMBOL(acpi_register_gsi);
-
 /*
  *  ACPI based hotplug support for CPU
  */
@@ -587,25 +584,6 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 
 EXPORT_SYMBOL(acpi_unregister_ioapic);
 
-static unsigned long __init
-acpi_scan_rsdp(unsigned long start, unsigned long length)
-{
-        unsigned long offset = 0;
-        unsigned long sig_len = sizeof("RSD PTR ") - 1;
-
-        /*
-         * Scan all 16-byte boundaries of the physical memory region for the
-         * RSDP signature.
-         */
-        for (offset = 0; offset < length; offset += 16) {
-                if (strncmp((char *)(phys_to_virt(start) + offset), "RSD PTR ", sig_len))
-                        continue;
-                return (start + offset);
-        }
-
-        return 0;
-}
-
 static int __init acpi_parse_sbf(struct acpi_table_header *table)
 {
         struct acpi_table_boot *sb;
@@ -748,27 +726,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
         return 0;
 }
 
-unsigned long __init acpi_find_rsdp(void)
-{
-        unsigned long rsdp_phys = 0;
-
-        if (efi_enabled) {
-                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
-                        return efi.acpi20;
-                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
-                        return efi.acpi;
-        }
-        /*
-         * Scan memory looking for the RSDP signature. First search EBDA (low
-         * memory) paragraphs and then search upper memory (E0000-FFFFF).
-         */
-        rsdp_phys = acpi_scan_rsdp(0, 0x400);
-        if (!rsdp_phys)
-                rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
-
-        return rsdp_phys;
-}
-
 #ifdef  CONFIG_X86_LOCAL_APIC
 /*
  * Parse LAPIC entries in MADT
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index a25db514c719..324eb0cab19c 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -46,6 +46,12 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
         buf[1] = 1;
         buf[2] = ACPI_PDC_C_CAPABILITY_SMP;
 
+        /*
+         * The default of PDC_SMP_T_SWCOORD bit is set for intel x86 cpu so
+         * that OSPM is capable of native ACPI throttling software
+         * coordination using BIOS supplied _TSD info.
+         */
+        buf[2] |= ACPI_PDC_SMP_T_SWCOORD;
         if (cpu_has(c, X86_FEATURE_EST))
                 buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;
 
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
index 76c3ab0da468..98d4fdb7dc04 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
@@ -189,10 +189,7 @@ static unsigned int pentium4_get_frequency(void)
                 printk(KERN_DEBUG "speedstep-lib: couldn't detect FSB speed. Please send an e-mail to <linux@brodo.de>\n");
 
         /* Multiplier. */
-        if (c->x86_model < 2)
-                mult = msr_lo >> 27;
-        else
-                mult = msr_lo >> 24;
+        mult = msr_lo >> 24;
 
         dprintk("P4 - FSB %u kHz; Multiplier %u; Speed %u kHz\n", fsb, mult, (fsb * mult));
 
diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/kernel/srat_32.c
index 2bf6903cb444..b72e61359c36 100644
--- a/arch/x86/kernel/srat_32.c
+++ b/arch/x86/kernel/srat_32.c
@@ -274,7 +274,7 @@ int __init get_memcfg_from_srat(void)
         int tables = 0;
         int i = 0;
 
-        rsdp_address = acpi_find_rsdp();
+        rsdp_address = acpi_os_get_root_pointer();
         if (!rsdp_address) {
                 printk("%s: System description tables not found\n",
                        __FUNCTION__);