---

yaml --- r: 252934 b: refs/heads/master c: 4f3c125 h: refs/heads/master v: v3
git-mirror · May 30, 2011 · f5d273d · f5d273d
1 parent 4e525e2
commit f5d273d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 598e887d8b01655780c81cc86a9e7820ed091580
+refs/heads/master: 4f3c125c7420c85eaff627145557e392a871922d
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
@@ -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;