From: guenther <guenther@openbsd.org>
Date: Fri, 19 Nov 2021 04:00:53 +0000 (+0000)
Subject: Correct the CPUID() and CPUID_LEAF() macros to not include a trailing
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e39a0fa594a87225c5d905131ea0ec12d166acf8;p=openbsd

Correct the CPUID() and CPUID_LEAF() macros to not include a trailing
semicolon

ok deraadt@
---

diff --git a/sys/arch/amd64/include/specialreg.h b/sys/arch/amd64/include/specialreg.h
index da9907fb370..6b32f07e2f4 100644
--- a/sys/arch/amd64/include/specialreg.h
+++ b/sys/arch/amd64/include/specialreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specialreg.h,v 1.90 2021/05/14 16:44:38 cheloha Exp $	*/
+/*	$OpenBSD: specialreg.h,v 1.91 2021/11/19 04:00:53 guenther Exp $	*/
 /*	$NetBSD: specialreg.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
 /*	$NetBSD: x86/specialreg.h,v 1.2 2003/04/25 21:54:30 fvdl Exp $	*/
 
@@ -327,11 +327,11 @@
 #define	CPUID(code, eax, ebx, ecx, edx)                         \
 	__asm volatile("cpuid"                                  \
 	    : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)    \
-	    : "a" (code));
+	    : "a" (code))
 #define	CPUID_LEAF(code, leaf, eax, ebx, ecx, edx)		\
 	__asm volatile("cpuid"                                  \
 	    : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)    \
-	    : "a" (code), "c" (leaf));
+	    : "a" (code), "c" (leaf))
 
 
 /*
diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h
index 076a89c03c5..6edce32b793 100644
--- a/sys/arch/i386/include/specialreg.h
+++ b/sys/arch/i386/include/specialreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specialreg.h,v 1.77 2021/03/11 11:16:57 jsg Exp $	*/
+/*	$OpenBSD: specialreg.h,v 1.78 2021/11/19 04:00:53 guenther Exp $	*/
 /*	$NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $	*/
 
 /*-
@@ -317,11 +317,11 @@
 #define	CPUID(code, eax, ebx, ecx, edx)                         \
 	__asm volatile("cpuid"                                  \
 	    : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)    \
-	    : "a" (code));
+	    : "a" (code))
 #define	CPUID_LEAF(code, leaf, eax, ebx, ecx, edx)		\
 	__asm volatile("cpuid"                                  \
 	    : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)    \
-	    : "a" (code), "c" (leaf));
+	    : "a" (code), "c" (leaf))
 
 
 /*