Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af0d6a0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of... 

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix mwait_play_dead() faulting on mwait-incapable cpus
  x86 idle: Fix mwait deprecation warning message

Evil merge to remove extra quote noticed by Joe Perches
parents 07ef3c3b 4f3c125c

arch/x86/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -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\n");

	} else if (!strcmp(str, "halt")) {

		/*

		 * When the boot option of idle=halt is added, halt is

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ static inline void mwait_play_dead(void) 
	void *mwait_ptr;

	struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info);



	if (!this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c))

	if (!(this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c)))

		return;

	if (!this_cpu_has(X86_FEATURE_CLFLSH))

		return;