From afbc77994a0c83e2653b419e87ebd72f90a135ed Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sun, 14 Mar 2010 16:28:46 -0400 Subject: [PATCH] --- yaml --- r: 188075 b: refs/heads/master c: 4c81ba4900ab4eb24c7d2ba1aca594c644b6ce4c h: refs/heads/master i: 188073: 800adb902d2e03084bfd74eb6d05c271a7d104d6 188071: 350ac80638ced6acd4c1f77d692946c43c04112d v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 7 +++++++ trunk/arch/x86/kernel/acpi/boot.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32b90c961192..1bed183c5fab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8144c880397d502d12af4ef721f3eac50163fa39 +refs/heads/master: 4c81ba4900ab4eb24c7d2ba1aca594c644b6ce4c diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index a5cc0db63d7a..ed511af0f79a 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -582,3 +582,10 @@ Why: The paravirt mmu host support is slower than non-paravirt mmu, both Who: Avi Kivity ---------------------------- + +What: "acpi=ht" boot option +When: 2.6.35 +Why: Useful in 2003, implementation is a hack. + Generally invoked by accident today. + Seen as doing more harm than good. +Who: Len Brown diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c index df586bbc9447..7914ab0ad76e 100644 --- a/trunk/arch/x86/kernel/acpi/boot.c +++ b/trunk/arch/x86/kernel/acpi/boot.c @@ -1559,8 +1559,10 @@ static int __init parse_acpi(char *arg) } /* Limit ACPI just to boot-time to enable HT */ else if (strcmp(arg, "ht") == 0) { - if (!acpi_force) + 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 */