From 3e9cff00757ebb4f6aeafe6c6115e8b0e05158f5 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 6 Dec 2010 16:20:25 +0100 Subject: [PATCH] --- yaml --- r: 223095 b: refs/heads/master c: e726f3c368e7c1919a7166ec09c5705759f1a69d h: refs/heads/master i: 223093: fcd0fe441f286ff89ed05c3b9a69eacabb1287d6 223091: ee6b764001310ce44e201643646a2a3001c09fc4 223087: 381ba6800dc04cfcda08f838504e7a8b9ccddd92 v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd64_edac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a633dc77fb17..6ba62877a73a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76f04f2591e60fa76e70a2736965bc810bf1c764 +refs/heads/master: e726f3c368e7c1919a7166ec09c5705759f1a69d diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c index 8521401bbd75..eca9ba193e94 100644 --- a/trunk/drivers/edac/amd64_edac.c +++ b/trunk/drivers/edac/amd64_edac.c @@ -1572,7 +1572,7 @@ static int f10_match_to_this_node(struct amd64_pvt *pvt, int dram_range, debugf1(" HoleOffset=0x%x HoleValid=0x%x IntlvSel=0x%x\n", hole_off, hole_valid, intlv_sel); - if (intlv_en || + if (intlv_en && (intlv_sel != ((sys_addr >> 12) & intlv_en))) return -EINVAL;