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: (27 commits)
  ACPI: Don't let acpi_pad needlessly mark TSC unstable
  drivers/acpi/sleep.h: Checkpatch cleanup
  ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion
  ACPI: delete unused c-state promotion/demotion data strucutures
  ACPI: video: fix acpi_backlight=video
  ACPI: EC: Use kmemdup
  drivers/acpi: use kasprintf
  ACPI, APEI, EINJ injection parameters support
  Add x64 support to debugfs
  ACPI, APEI, Use ERST for persistent storage of MCE
  ACPI, APEI, Error Record Serialization Table (ERST) support
  ACPI, APEI, Generic Hardware Error Source memory error support
  ACPI, APEI, UEFI Common Platform Error Record (CPER) header
  Unified UUID/GUID definition
  ACPI Hardware Error Device (PNP0C33) support
  ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
  ACPI, APEI, Document for APEI
  ACPI, APEI, EINJ support
  ACPI, APEI, HEST table parsing
  ACPI, APEI, APEI supporting infrastructure
  ...

2 files changed, 3 insertions, 18 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 488be461a38..60cc4058ed5 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -63,7 +63,6 @@ EXPORT_SYMBOL(acpi_disabled);
 int acpi_noirq;                         /* skip ACPI IRQ initialization */
 int acpi_pci_disabled;          /* skip ACPI PCI scan and IRQ initialization */
 EXPORT_SYMBOL(acpi_pci_disabled);
-int acpi_ht __initdata = 1;     /* enable HT */
 
 int acpi_lapic;
 int acpi_ioapic;
@@ -1501,9 +1500,8 @@ void __init acpi_boot_table_init(void)
 
         /*
          * If acpi_disabled, bail out
-         * One exception: acpi=ht continues far enough to enumerate LAPICs
          */
-        if (acpi_disabled && !acpi_ht)
+        if (acpi_disabled)
                 return; 
 
         /*
@@ -1534,9 +1532,8 @@ int __init early_acpi_boot_init(void)
 {
         /*
          * If acpi_disabled, bail out
-         * One exception: acpi=ht continues far enough to enumerate LAPICs
          */
-        if (acpi_disabled && !acpi_ht)
+        if (acpi_disabled)
                 return 1;
 
         /*
@@ -1554,9 +1551,8 @@ int __init acpi_boot_init(void)
 
         /*
          * If acpi_disabled, bail out
-         * One exception: acpi=ht continues far enough to enumerate LAPICs
          */
-        if (acpi_disabled && !acpi_ht)
+        if (acpi_disabled)
                 return 1;
 
         acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
@@ -1591,21 +1587,12 @@ static int __init parse_acpi(char *arg)
         /* acpi=force to over-ride black-list */
         else if (strcmp(arg, "force") == 0) {
                 acpi_force = 1;
-                acpi_ht = 1;
                 acpi_disabled = 0;
         }
         /* acpi=strict disables out-of-spec workarounds */
         else if (strcmp(arg, "strict") == 0) {
                 acpi_strict = 1;
         }
-        /* Limit ACPI just to boot-time to enable HT */
-        else if (strcmp(arg, "ht") == 0) {
-                if (!acpi_force) {
-                        printk(KERN_WARNING "acpi=ht will be removed in Linux-2.6.35\n");
-                        disable_acpi();
-                }
-                acpi_ht = 1;
-        }
         /* acpi=rsdt use RSDT instead of XSDT */
         else if (strcmp(arg, "rsdt") == 0) {
                 acpi_rsdt_forced = 1;
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index f9961034e55..82e508677b9 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -162,8 +162,6 @@ static int __init acpi_sleep_setup(char *str)
 #endif
                 if (strncmp(str, "old_ordering", 12) == 0)
                         acpi_old_suspend_ordering();
-                if (strncmp(str, "sci_force_enable", 16) == 0)
-                        acpi_set_sci_en_on_resume();
                 str = strchr(str, ',');
                 if (str != NULL)
                         str += strspn(str, ", \t");