Module Name:    src
Committed By:   msaitoh
Date:           Mon Mar 12 07:12:54 UTC 2018

Modified Files:
        src/sys/arch/x86/include: specialreg.h
        src/sys/arch/x86/x86: identcpu.c

Log Message:
s/CLFUSH/CLFLUSH/
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/x86/x86/identcpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.113 src/sys/arch/x86/include/specialreg.h:1.114
--- src/sys/arch/x86/include/specialreg.h:1.113	Thu Mar  8 04:15:11 2018
+++ src/sys/arch/x86/include/specialreg.h	Mon Mar 12 07:12:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.113 2018/03/08 04:15:11 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.114 2018/03/12 07:12:54 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -250,7 +250,7 @@
 
 /* CPUID Fn00000001 %ebx */
 #define	CPUID_BRAND_INDEX	__BITS(7,0)
-#define	CPUID_CLFUSH_SIZE	__BITS(15,8)
+#define	CPUID_CLFLUSH_SIZE	__BITS(15,8)
 #define	CPUID_HTT_CORES		__BITS(23,16)
 #define	CPUID_LOCAL_APIC_ID	__BITS(31,24)
 

Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.69 src/sys/arch/x86/x86/identcpu.c:1.70
--- src/sys/arch/x86/x86/identcpu.c:1.69	Fri Feb  9 18:45:55 2018
+++ src/sys/arch/x86/x86/identcpu.c	Mon Mar 12 07:12:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: identcpu.c,v 1.69 2018/02/09 18:45:55 maxv Exp $	*/
+/*	$NetBSD: identcpu.c,v 1.70 2018/03/12 07:12:54 msaitoh 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.69 2018/02/09 18:45:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.70 2018/03/12 07:12:54 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -842,7 +842,7 @@ cpu_probe(struct cpu_info *ci)
 		/* CLFLUSH line size is next 8 bits */
 		if (ci->ci_feat_val[0] & CPUID_CFLUSH)
 			ci->ci_cflush_lsize
-			    = __SHIFTOUT(miscbytes, CPUID_CLFUSH_SIZE) << 3;
+			    = __SHIFTOUT(miscbytes, CPUID_CLFLUSH_SIZE) << 3;
 		ci->ci_initapicid = __SHIFTOUT(miscbytes, CPUID_LOCAL_APIC_ID);
 	}
 

Reply via email to