From 48247ad9c2bea53cb9344a255adcf2fe323612fe Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Mon, 23 Jan 2012 15:54:52 -0500
Subject: [PATCH] --- yaml --- r: 292759 b: refs/heads/master c:
 fadd85f16a8ec3fee8af599e79a209682dc52348 h: refs/heads/master i:   292757:
 2d7a0251a2c2a5de6078a7f4300517d3649d5d1e   292755:
 97971812849e6461791d82ec3dfee398e67320c5   292751:
 5ba3dbd7a7a712df852ac49ee2325ead1cdd2279 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0fc7c90c135..17845a16025a 100644
--- 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
index 4979a5dfeba2..87c56ba8080c 100644
--- 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;