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

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Thu Mar 29 07:15:12 UTC 2018

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

Log Message:
Fix sysctl type, should be bool.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/spectre.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/x86/svs.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.3 src/sys/arch/x86/x86/spectre.c:1.4
--- src/sys/arch/x86/x86/spectre.c:1.3	Wed Mar 28 19:50:57 2018
+++ src/sys/arch/x86/x86/spectre.c	Thu Mar 29 07:15:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: spectre.c,v 1.3 2018/03/28 19:50:57 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.4 2018/03/29 07:15:12 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.3 2018/03/28 19:50:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.4 2018/03/29 07:15:12 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -338,9 +338,10 @@ int
 sysctl_machdep_spectreV2_mitigated(SYSCTLFN_ARGS)
 {
 	struct sysctlnode node;
-	int error, val;
+	int error;
+	bool val;
 
-	val = *(int *)rnode->sysctl_data;
+	val = *(bool *)rnode->sysctl_data;
 
 	node = *rnode;
 	node.sysctl_data = &val;

Index: src/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.14 src/sys/arch/x86/x86/svs.c:1.15
--- src/sys/arch/x86/x86/svs.c:1.14	Tue Mar 13 16:45:52 2018
+++ src/sys/arch/x86/x86/svs.c	Thu Mar 29 07:15:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: svs.c,v 1.14 2018/03/13 16:45:52 maxv Exp $	*/
+/*	$NetBSD: svs.c,v 1.15 2018/03/29 07:15:12 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.14 2018/03/13 16:45:52 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.15 2018/03/29 07:15:12 maxv Exp $");
 
 #include "opt_svs.h"
 
@@ -720,9 +720,10 @@ int
 sysctl_machdep_svs_enabled(SYSCTLFN_ARGS)
 {
 	struct sysctlnode node;
-	int error, val;
+	int error;
+	bool val;
 
-	val = *(int *)rnode->sysctl_data;
+	val = *(bool *)rnode->sysctl_data;
 
 	node = *rnode;
 	node.sysctl_data = &val;