summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-02-16 03:45:45 -0500
committerLen Brown <len.brown@intel.com>2010-02-18 03:49:38 -0500
commit49bf83a45fc677db1ed44d0e072e6aaeabe4e124 (patch)
treef49ce39e5a817b32aa4af734add2fba3e731e392 /arch
parent97c169d39b6846a564dc8d883832e7fef9bdb77d (diff)
downloadop-kernel-dev-49bf83a45fc677db1ed44d0e072e6aaeabe4e124.zip
op-kernel-dev-49bf83a45fc677db1ed44d0e072e6aaeabe4e124.tar.gz
ACPI: fix "acpi=ht" boot option
We broke "acpi=ht" in 2.6.32 by disabling MADT parsing for acpi=disabled. e5b8fc6ac158f65598f58dba2c0d52ba3b412f52 This also broke systems which invoked acpi=ht via DMI blacklist. acpi=ht is a really ugly hack, but restore it for those that still use it. http://bugzilla.kernel.org/show_bug.cgi?id=14886 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 7ae5889..e97b255 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -94,6 +94,7 @@ 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) { }
OpenPOWER on IntegriCloud