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

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri Aug 30 13:29:17 UTC 2019

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

Log Message:
 Use macro.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/x86/spectre.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/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.29 src/sys/arch/x86/x86/spectre.c:1.30
--- src/sys/arch/x86/x86/spectre.c:1.29	Sat Jun  1 06:54:28 2019
+++ src/sys/arch/x86/x86/spectre.c	Fri Aug 30 13:29:17 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: spectre.c,v 1.29 2019/06/01 06:54:28 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.30 2019/08/30 13:29:17 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2018-2019 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.29 2019/06/01 06:54:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.30 2019/08/30 13:29:17 msaitoh Exp $");
 
 #include "opt_spectre.h"
 
@@ -435,7 +435,7 @@ v4_detect_method(void)
 				break;
 			}
 	 		x86_cpuid(0x80000008, descs);
-			if (descs[1] & __BIT(26)) {
+			if (descs[1] & CPUID_CAPEX_SSB_NO) {
 				/* Not vulnerable to SpectreV4. */
 				v4_mitigation_method = V4_MITIGATION_AMD_SSB_NO;
 				return;