---

yaml --- r: 292759 b: refs/heads/master c: fadd85f h: refs/heads/master i: 292757: 2d7a025 292755: 9797181 292751: 5ba3dbd v: v3
git-mirror · Feb 22, 2012 · 48247ad · 48247ad
1 parent 9d72cba
commit 48247ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6126ef5f31ca54980cb067af659a360dfcca037
+refs/heads/master: fadd85f16a8ec3fee8af599e79a209682dc52348
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1541,6 +1541,12 @@ static int __mce_read_apei(char __user **ubuf, size_t usize)
 	/* Error or no more MCE record */
 	if (rc <= 0) {
 		mce_apei_read_done = 1;
+		/*
+		 * When ERST is disabled, mce_chrdev_read() should return
+		 * "no record" instead of "no device."
+		 */
+		if (rc == -ENODEV)
+			return 0;
 		return rc;
 	}
 	rc = -EFAULT;