CVS commit: src/sys/arch/x86/x86

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Tue Sep 12 07:19:36 UTC 2017

Modified Files:
        src/sys/arch/x86/x86: identcpu.c

Log Message:
Set ci->ci_cflush_lsize correctly. This bug was added in the last commit(1.56).


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 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/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.56 src/sys/arch/x86/x86/identcpu.c:1.57
--- src/sys/arch/x86/x86/identcpu.c:1.56	Thu Sep  7 06:40:42 2017
+++ src/sys/arch/x86/x86/identcpu.c	Tue Sep 12 07:19:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: identcpu.c,v 1.56 2017/09/07 06:40:42 msaitoh Exp $	*/
+/*	$NetBSD: identcpu.c,v 1.57 2017/09/12 07:19:36 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.56 2017/09/07 06:40:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.57 2017/09/12 07:19:36 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -848,7 +848,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);
+			    = __SHIFTOUT(miscbytes, CPUID_CLFUSH_SIZE) << 3;
 		ci->ci_initapicid = __SHIFTOUT(miscbytes, CPUID_LOCAL_APIC_ID);
 	}