From d5193dbb58350c49bd5c48ef9d0f7a7fd2960399 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Mon, 22 Jun 2009 19:42:24 +0200
Subject: [PATCH] --- yaml --- r: 154420 b: refs/heads/master c:
 30c875cbc1836a03a1acc6c998fa8a04f29f8f73 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/edac/amd64_edac.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aebe39c9db43..5b7e2a95982e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584fcff428bde3b9985ba21498764e9dba2fd3ce
+refs/heads/master: 30c875cbc1836a03a1acc6c998fa8a04f29f8f73
diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c
index 3b76605330e9..8497963a61f6 100644
--- a/trunk/drivers/edac/amd64_edac.c
+++ b/trunk/drivers/edac/amd64_edac.c
@@ -2966,7 +2966,12 @@ static int amd64_check_ecc_enabled(struct amd64_pvt *pvt)
 				"    Use of the override can cause "
 				"unknown side effects.\n");
 			ret = -ENODEV;
-		}
+		} else
+			/*
+			 * enable further driver loading if ECC enable is
+			 * overridden.
+			 */
+			ret = 0;
 	} else {
 		amd64_printk(KERN_INFO,
 			"ECC is enabled by BIOS, Proceeding "