Merge branch 'for-4.9' into for-4.10

2016-10-19 12:12:40 -04:00
parent 1001354ca3 2186d9f940
commit 8bc4a04455
8 changed files with 102 additions and 48 deletions
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -499,7 +499,7 @@ int mce_available(struct cpuinfo_x86 *c)

 static void mce_schedule_work(void)
 {
-	if (!mce_gen_pool_empty() && keventd_up())
+	if (!mce_gen_pool_empty())
 		schedule_work(&mce_work);
 }