Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Feb 2017 11:41:58 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r314385 - stable/11/sys/x86/x86
Message-ID:  <201702281141.v1SBfwdK016508@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Tue Feb 28 11:41:57 2017
New Revision: 314385
URL: https://svnweb.freebsd.org/changeset/base/314385

Log:
  MFC r313751: mca: fix writes to MSR_MC_CTL2 in cmci_update

Modified:
  stable/11/sys/x86/x86/mca.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/x86/mca.c
==============================================================================
--- stable/11/sys/x86/x86/mca.c	Tue Feb 28 11:38:11 2017	(r314384)
+++ stable/11/sys/x86/x86/mca.c	Tue Feb 28 11:41:57 2017	(r314385)
@@ -548,7 +548,7 @@ cmci_update(enum scan_mode mode, int ban
 			limit = min(limit << 1, cc->max_threshold);
 			ctl &= ~MC_CTL2_THRESHOLD;
 			ctl |= limit;
-			wrmsr(MSR_MC_CTL2(bank), limit);
+			wrmsr(MSR_MC_CTL2(bank), ctl);
 		}
 		cc->last_intr = time_uptime;
 		return;
@@ -581,7 +581,7 @@ cmci_update(enum scan_mode mode, int ban
 	if ((ctl & MC_CTL2_THRESHOLD) != limit) {
 		ctl &= ~MC_CTL2_THRESHOLD;
 		ctl |= limit;
-		wrmsr(MSR_MC_CTL2(bank), limit);
+		wrmsr(MSR_MC_CTL2(bank), ctl);
 	}
 }
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702281141.v1SBfwdK016508>