From 955497113c24aac6990c8c23a5deb73c57372b1c Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Wed, 11 Jul 2018 20:07:55 +0000
Subject: [PATCH] Declare cpu_meltdown in <machine/cpu.h>

---
 sys/arch/amd64/amd64/identcpu.c | 3 +--
 sys/arch/amd64/amd64/pmap.c     | 4 +---
 sys/arch/amd64/include/cpu.h    | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c
index 8595a0df244..2bedf138471 100644
--- a/sys/arch/amd64/amd64/identcpu.c
+++ b/sys/arch/amd64/amd64/identcpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identcpu.c,v 1.100 2018/07/03 08:42:32 jsg Exp $	*/
+/*	$OpenBSD: identcpu.c,v 1.101 2018/07/11 20:07:55 guenther Exp $	*/
 /*	$NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $	*/
 
 /*
@@ -466,7 +466,6 @@ identifycpu(struct cpu_info *ci)
 	int i;
 	char *brandstr_from, *brandstr_to;
 	int skipspace;
-	extern uint32_t cpu_meltdown;
 
 	CPUID(1, ci->ci_signature, val, dummy, ci->ci_feature_flags);
 	CPUID(0x80000000, ci->ci_pnfeatset, dummy, dummy, dummy);
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index adc8366722e..81b3af7ff18 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.114 2018/04/26 06:51:48 mpi Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.115 2018/07/11 20:07:55 guenther Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -279,8 +279,6 @@ extern vaddr_t lo32_paddr;
 vaddr_t virtual_avail;
 extern int end;
 
-extern uint32_t cpu_meltdown;
-
 /*
  * local prototypes
  */
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index f507e7c17bf..d345dd9ca64 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.125 2018/07/06 02:43:01 guenther Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.126 2018/07/11 20:07:55 guenther Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -352,6 +352,7 @@ extern int cpu_id;
 extern char cpu_vendor[];
 extern int cpuid_level;
 extern int cpuspeed;
+extern int cpu_meltdown;
 
 /* cpu.c */
 extern u_int cpu_mwait_size;
-- 
2.20.1