Merge branch 'ht-delete-2.6.35' into release

4 files changed, 3 insertions, 20 deletions

diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 21adbd7f90f8..837dc82a013e 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -94,7 +94,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
 #define acpi_noirq 0    /* ACPI always enabled on IA64 */
 #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
 #define acpi_strict 1   /* no ACPI spec workarounds on IA64 */
-#define acpi_ht 0       /* no HT-only mode on IA64 */
 #endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 56f462cf22d2..aa2c39d968fc 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -85,7 +85,6 @@ extern int acpi_ioapic;
 extern int acpi_noirq;
 extern int acpi_strict;
 extern int acpi_disabled;
-extern int acpi_ht;
 extern int acpi_pci_disabled;
 extern int acpi_skip_timer_override;
 extern int acpi_use_timer_override;
@@ -97,7 +96,6 @@ void acpi_pic_sci_set_trigger(unsigned int, u16);
 static inline void disable_acpi(void)
 {
         acpi_disabled = 1;
-        acpi_ht = 0;
         acpi_pci_disabled = 1;
         acpi_noirq = 1;
 }
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index cd40aba6aa95..b7023430d4dc 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;
@@ -1464,9 +1463,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; 
 
         /*
@@ -1497,9 +1495,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;
 
         /*
@@ -1517,9 +1514,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);
@@ -1554,21 +1550,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/lguest/boot.c b/arch/x86/lguest/boot.c
index 2bdf628066bd..9257510b4836 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1390,7 +1390,6 @@ __init void lguest_init(void)
 #endif
 #ifdef CONFIG_ACPI
         acpi_disabled = 1;
-        acpi_ht = 0;
 #endif
 
         /*