From 97a63775f7a70fc1d5b2d0f97c1c59c0dfd5e2fb Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 1 Apr 2011 15:46:09 -0400 Subject: [PATCH] --- yaml --- r: 252757 b: refs/heads/master c: 5d4c47e0195b989f284907358bd5c268a44b91c7 h: refs/heads/master i: 252755: 06f0183314d52c115246c5ade018186ad1437a37 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 7 +++++++ trunk/arch/x86/kernel/process.c | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 29f9966238ee..e60664955a2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdaab4a0d330f70c0e5ad8c3f7c65c2e375ea180 +refs/heads/master: 5d4c47e0195b989f284907358bd5c268a44b91c7 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index f1b0eb02aa1d..13f0bb3187bc 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -35,6 +35,13 @@ Who: Len Brown ---------------------------- +What: x86 "idle=mwait" cmdline param +When: 2012 +Why: simplify x86 idle code +Who: Len Brown + +---------------------------- + What: PRISM54 When: 2.6.34 diff --git a/trunk/arch/x86/kernel/process.c b/trunk/arch/x86/kernel/process.c index 84f3cdae4407..8fb182956cbc 100644 --- a/trunk/arch/x86/kernel/process.c +++ b/trunk/arch/x86/kernel/process.c @@ -645,6 +645,7 @@ static int __init idle_setup(char *str) boot_option_idle_override = IDLE_POLL; } else if (!strcmp(str, "mwait")) { boot_option_idle_override = IDLE_FORCE_MWAIT; + WARN_ONCE(1, "\idle=mwait\" will be removed in 2012\"\n"); } else if (!strcmp(str, "halt")) { /* * When the boot option of idle=halt is added, halt is