From: deraadt <deraadt@openbsd.org>
Date: Mon, 15 Mar 2021 15:49:20 +0000 (+0000)
Subject: Don't put an extern variable (ppc_kvm_stolen) into vmparam.h, other instances
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=08e7272b46eb3cbeff5e418de069c2be48ef04ab;p=openbsd

Don't put an extern variable (ppc_kvm_stolen) into vmparam.h, other instances
of this file are only doing cpp #define
---

diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h
index 0b498c973fc..740ae2ef071 100644
--- a/sys/arch/macppc/include/vmparam.h
+++ b/sys/arch/macppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.31 2015/11/01 20:10:00 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.32 2021/03/15 15:49:20 deraadt Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
@@ -87,10 +87,6 @@
 #define VM_PIE_MIN_ADDR		PAGE_SIZE
 #define VM_PIE_MAX_ADDR		0x40000000
 
-/* ppc_kvm_stolen is so that vm space can be stolen before vm is fully
- * initialized.
- */
-extern vaddr_t ppc_kvm_stolen;
 #define VM_KERN_ADDRESS_SIZE  (PPC_SEGMENT_LENGTH - (32 * 1024 * 1024))
 #define	VM_MAX_KERNEL_ADDRESS	(VM_MIN_KERNEL_ADDRESS + VM_KERN_ADDRESS_SIZE)
 
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 92bab4e4424..3a01cd508ac 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.174 2021/03/11 11:16:59 jsg Exp $ */
+/*	$OpenBSD: pmap.c,v 1.175 2021/03/15 15:49:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 2015 Martin Pieuchot
@@ -1461,6 +1461,7 @@ pmap_bootstrap(u_int kernelstart, u_int kernelend)
 	int i, k;
 	struct pmapvp *vp1;
 	struct pmapvp *vp2;
+	extern vaddr_t ppc_kvm_stolen;
 
 	/*
 	 * set the page size (default value is 4K which is ok)