From c29d06141fbdb9137c7bafd5adfd2b39ca799c44 Mon Sep 17 00:00:00 2001 From: Bryan Steele Date: Sat, 5 Oct 2013 18:47:06 +0000 Subject: Use K1X_FID macro on msr read. --- sys/arch/amd64/amd64/k1x-pstate.c | 4 ++-- sys/arch/i386/i386/k1x-pstate.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/arch/amd64/amd64/k1x-pstate.c b/sys/arch/amd64/amd64/k1x-pstate.c index f377d30e067..ff43fc6a919 100644 --- a/sys/arch/amd64/amd64/k1x-pstate.c +++ b/sys/arch/amd64/amd64/k1x-pstate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: k1x-pstate.c,v 1.4 2012/01/31 01:59:20 jsg Exp $ */ +/* $OpenBSD: k1x-pstate.c,v 1.5 2013/10/05 18:47:05 brynet Exp $ */ /* * Copyright (c) 2011 Bryan Steele * @@ -110,7 +110,7 @@ k1x_transition(struct k1x_cpu_state *cstate, int level) wrmsr(MSR_K1X_CONTROL, fid); for (i = 0; i < 100; i++) { msr = rdmsr(MSR_K1X_STATUS); - if (msr == fid) + if (K1X_FID(msr) == fid) break; DELAY(100); } diff --git a/sys/arch/i386/i386/k1x-pstate.c b/sys/arch/i386/i386/k1x-pstate.c index 50397bae85a..25d88d57866 100644 --- a/sys/arch/i386/i386/k1x-pstate.c +++ b/sys/arch/i386/i386/k1x-pstate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: k1x-pstate.c,v 1.4 2012/01/31 01:59:20 jsg Exp $ */ +/* $OpenBSD: k1x-pstate.c,v 1.5 2013/10/05 18:47:05 brynet Exp $ */ /* * Copyright (c) 2011 Bryan Steele * @@ -110,7 +110,7 @@ k1x_transition(struct k1x_cpu_state *cstate, int level) wrmsr(MSR_K1X_CONTROL, fid); for (i = 0; i < 100; i++) { msr = rdmsr(MSR_K1X_STATUS); - if (msr == fid) + if (K1X_FID(msr) == fid) break; DELAY(100); } -- cgit v1.2.3