diff options
| author |   deraadt <deraadt@openbsd.org> | 2020-09-23 15:13:26 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2020-09-23 15:13:26 +0000 |
| commit | 750d0d46d7e898ca2fa5eab5dde9f8cf6c524a72 (patch) | |
| tree | 26e1567110368c64f86e097e49e8bca2842d3f46 | |
| parent | Escape+Up and the other arrow keys should be kept as Escape+Up and not (diff) | |
| download | wireguard-openbsd-750d0d46d7e898ca2fa5eab5dde9f8cf6c524a72.tar.xz wireguard-openbsd-750d0d46d7e898ca2fa5eab5dde9f8cf6c524a72.zip | |
shuffle "extern int cpu_pae" into cpu.h, as the number of users will soon
increase.
ok kettenis
| -rw-r--r-- | sys/arch/i386/i386/db_memrw.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/pmapae.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c index 39b72c99a3d..3a39c698d55 100644 --- a/sys/arch/i386/i386/db_memrw.c +++ b/sys/arch/i386/i386/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.17 2017/04/30 13:04:49 mpi Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.18 2020/09/23 15:13:26 deraadt Exp $ */ /* $NetBSD: db_memrw.c,v 1.6 1999/04/12 20:38:19 pk Exp $ */ /* @@ -46,8 +46,6 @@ #define PG_LGFRAME 0xffc00000 /* large (4M) page frame mask */ #define PG_LGFRAME_PAE 0xffe00000 /* large (2M) page frame mask */ -extern int cpu_pae; - /* * Read bytes from kernel address space for debugger. */ diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c index 5fa18738474..ef280cc7c19 100644 --- a/sys/arch/i386/i386/pmap.c +++ b/sys/arch/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.206 2020/09/13 12:05:23 jsg Exp $ */ +/* $OpenBSD: pmap.c,v 1.207 2020/09/23 15:13:26 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $ */ /* @@ -375,8 +375,6 @@ struct pmap __attribute__ ((aligned (32))) kernel_pmap_store; int nkpde = NKPTP; int nkptp_max = 1024 - (KERNBASE / NBPD) - 1; -extern int cpu_pae; - /* * pg_g_kern: if CPU is affected by Meltdown pg_g_kern is 0, * otherwise it is is set to PG_G. pmap_pg_g will be dervied diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c index ee08e9f8368..0ccd30be4de 100644 --- a/sys/arch/i386/i386/pmapae.c +++ b/sys/arch/i386/i386/pmapae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmapae.c,v 1.59 2020/09/13 12:05:23 jsg Exp $ */ +/* $OpenBSD: pmapae.c,v 1.60 2020/09/23 15:13:26 deraadt Exp $ */ /* * Copyright (c) 2006-2008 Michael Shalayeff @@ -617,7 +617,7 @@ pmap_pte_paddr_pae(vaddr_t va) void pmap_bootstrap_pae(void) { - extern int cpu_pae, nkpde; + extern int nkpde; struct pmap *kpm = pmap_kernel(); struct vm_page *ptp; paddr_t ptaddr; diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index ec4f2e432e7..368eba51234 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.170 2020/05/31 06:23:57 dlg Exp $ */ +/* $OpenBSD: cpu.h,v 1.171 2020/09/23 15:13:26 deraadt Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -361,6 +361,7 @@ extern int cpu_perf_eax; extern int cpu_perf_ebx; extern int cpu_perf_edx; extern int cpu_apmi_edx; +extern int cpu_pae; /* cpu has both PAE and NX features */ /* cpu.c */ extern u_int cpu_mwait_size; |