diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-02 10:59:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-02 10:59:14 +1000 |
| commit | 2776d9cc6303759d419b91cb7881fccf4ef00887 (patch) | |
| tree | 44b95f1fc97f816a6620f564124f97f87b0e99d9 /arch | |
| parent | e6cfa7f2e286a073426137149cc8719cac1acede (diff) | |
| parent | 8a27ef90237ff6377e11b0218acebae0ec0b939e (diff) | |
Merge remote-tracking branch 'idle-test/idle-test'
Conflicts:
arch/x86/kernel/process.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 2e4928d45a2d..c54f87dc7fb1 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -642,7 +642,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"); + WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012"); } else if (!strcmp(str, "halt")) { /* * When the boot option of idle=halt is added, halt is |