Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src use a correct macro.



details:   https://anonhg.NetBSD.org/src/rev/292866da3a25
branches:  trunk
changeset: 773481:292866da3a25
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Feb 03 05:06:51 2012 +0000

description:
use a correct macro.
releng@ ok

diffstat:

 sys/arch/x86/x86/identcpu.c |  6 +++---
 usr.sbin/cpuctl/arch/i386.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 2aad5cb46835 -r 292866da3a25 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Fri Feb 03 05:06:08 2012 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Fri Feb 03 05:06:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.28 2011/03/04 04:48:39 jruoho Exp $     */
+/*     $NetBSD: identcpu.c,v 1.29 2012/02/03 05:06:51 yamt Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.28 2011/03/04 04:48:39 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.29 2012/02/03 05:06:51 yamt Exp $");
 
 #include "opt_xen.h"
 
@@ -168,7 +168,7 @@
        cai = &ci->ci_cinfo[CAI_DCACHE];
        cai->cai_totalsize = AMD_L1_ECX_DC_SIZE(descs[2]);
        cai->cai_associativity = AMD_L1_ECX_DC_ASSOC(descs[2]);
-       cai->cai_linesize = AMD_L1_EDX_IC_LS(descs[2]);
+       cai->cai_linesize = AMD_L1_ECX_DC_LS(descs[2]);
 
        cai = &ci->ci_cinfo[CAI_ICACHE];
        cai->cai_totalsize = AMD_L1_EDX_IC_SIZE(descs[3]);
diff -r 2aad5cb46835 -r 292866da3a25 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Fri Feb 03 05:06:08 2012 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Fri Feb 03 05:06:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.26 2011/12/04 17:00:10 chs Exp $    */
+/*     $NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.26 2011/12/04 17:00:10 chs Exp $");
+__RCSID("$NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1694,7 +1694,7 @@
        cai = &ci->ci_cinfo[CAI_DCACHE];
        cai->cai_totalsize = AMD_L1_ECX_DC_SIZE(descs[2]);
        cai->cai_associativity = AMD_L1_ECX_DC_ASSOC(descs[2]);
-       cai->cai_linesize = AMD_L1_EDX_IC_LS(descs[2]);
+       cai->cai_linesize = AMD_L1_ECX_DC_LS(descs[2]);
 
        cai = &ci->ci_cinfo[CAI_ICACHE];
        cai->cai_totalsize = AMD_L1_EDX_IC_SIZE(descs[3]);



Home | Main Index | Thread Index | Old Index