From b9b7eb272010f7e26233a1068616005917ad2b4f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 8 Nov 2006 16:38:47 +0000 Subject: [PATCH] Move the Maxmem extern to systm.h --- sys/platform/pc32/include/lock.h | 4 +--- sys/platform/pc32/include/md_var.h | 3 +-- sys/sys/systm.h | 11 ++++++++++- sys/vfs/nfs/bootp_subr.c | 3 +-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/platform/pc32/include/lock.h b/sys/platform/pc32/include/lock.h index 39b4d27eb1..e832997a41 100644 --- a/sys/platform/pc32/include/lock.h +++ b/sys/platform/pc32/include/lock.h @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/lock.h,v 1.11.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/platform/pc32/include/lock.h,v 1.15 2006/11/07 06:43:24 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/lock.h,v 1.16 2006/11/08 16:38:47 dillon Exp $ */ #ifndef _MACHINE_LOCK_H_ @@ -154,8 +154,6 @@ void imen_lock(void); /* disables int / spinlock combo */ void imen_unlock(void); void clock_lock(void); /* disables int / spinlock combo */ void clock_unlock(void); -void cons_lock(void); /* disables int / spinlock combo */ -void cons_unlock(void); extern struct spinlock_deprecated smp_rv_spinlock; diff --git a/sys/platform/pc32/include/md_var.h b/sys/platform/pc32/include/md_var.h index 3268d780fd..ed8b6ffc4c 100644 --- a/sys/platform/pc32/include/md_var.h +++ b/sys/platform/pc32/include/md_var.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/md_var.h,v 1.35.2.4 2003/01/22 20:14:53 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.20 2006/11/07 20:48:15 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.21 2006/11/08 16:38:47 dillon Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -41,7 +41,6 @@ * Miscellaneous machine-dependent declarations. */ -extern vm_paddr_t Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ extern void **bcopy_vector; extern void **memcpy_vector; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index fcfab472f1..0304de5b55 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -37,7 +37,7 @@ * * @(#)systm.h 8.7 (Berkeley) 3/29/95 * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $ - * $DragonFly: src/sys/sys/systm.h,v 1.45 2006/11/07 20:48:15 dillon Exp $ + * $DragonFly: src/sys/sys/systm.h,v 1.46 2006/11/08 16:38:43 dillon Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -91,6 +91,8 @@ extern int ncpus2_mask; /* ncpus2 - 1 */ extern int clocks_running; /* timing/timeout subsystem is operational */ extern u_int cpu_feature; /* CPUID_* features */ +extern int nfs_diskless_valid; /* NFS diskless params were obtained */ +extern vm_paddr_t Maxmem; /* Highest physical memory address in system */ #ifdef INVARIANTS /* The option is always available */ #define KASSERT(exp,msg) do { if (!(exp)) panic msg; } while (0) @@ -200,6 +202,13 @@ void startprofclock (struct proc *); void stopprofclock (struct proc *); void setstatclockrate (int hzrate); +/* + * Console I/O spinlocks - these typically also hard-disable interrupts + * for the duration. + */ +void cons_lock(void); +void cons_unlock(void); + char *kgetenv (const char *name); #define testenv kgetenv #define freeenv(p) diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c index 7e210e45ce..a26312f98c 100644 --- a/sys/vfs/nfs/bootp_subr.c +++ b/sys/vfs/nfs/bootp_subr.c @@ -38,7 +38,7 @@ * nfs/krpc_subr.c * $NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $ * $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $ - * $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.19 2006/09/05 03:48:13 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.20 2006/11/08 16:38:46 dillon Exp $ */ #include "opt_bootp.h" @@ -212,7 +212,6 @@ struct bootpc_globalcontext { #define DHCP_REQUEST 3 #define DHCP_ACK 5 -extern int nfs_diskless_valid; extern struct nfsv3_diskless nfsv3_diskless; static char bootp_cookie[128]; SYSCTL_STRING(_kern, OID_AUTO, bootp_cookie, CTLFLAG_RD, -- 2.41.0