Don't include <machine/pmap.h> and <machine/vmparam.h> if _KERNEL isn't
defined. Include them explicitly in the few kvm_arch.c that need them.
This commit is contained in:
matt
parent
ca351acf50
commit
cce919e025
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_alpha.c,v 1.18 2000/06/29 06:34:23 mrg Exp $ */
|
||||
/* $NetBSD: kvm_alpha.c,v 1.19 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
#include <kvm.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <machine/pmap.h>
|
||||
|
||||
#include <limits.h>
|
||||
#include <db.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_i386.c,v 1.17 2000/06/29 06:34:24 mrg Exp $ */
|
||||
/* $NetBSD: kvm_i386.c,v 1.18 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_i386.c,v 1.17 2000/06/29 06:34:24 mrg Exp $");
|
||||
__RCSID("$NetBSD: kvm_i386.c,v 1.18 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -68,7 +68,9 @@ __RCSID("$NetBSD: kvm_i386.c,v 1.17 2000/06/29 06:34:24 mrg Exp $");
|
|||
|
||||
#include "kvm_private.h"
|
||||
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/pte.h>
|
||||
#include <machine/vmparam.h>
|
||||
|
||||
#ifndef btop
|
||||
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_mips.c,v 1.15 2000/06/29 06:34:24 mrg Exp $ */
|
||||
/* $NetBSD: kvm_mips.c,v 1.16 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: kvm_mips.c,v 1.15 2000/06/29 06:34:24 mrg Exp $");
|
||||
__RCSID("$NetBSD: kvm_mips.c,v 1.16 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
/*
|
||||
|
|
@ -60,6 +60,7 @@ __RCSID("$NetBSD: kvm_mips.c,v 1.15 2000/06/29 06:34:24 mrg Exp $");
|
|||
#include "kvm_private.h"
|
||||
|
||||
#include <mips/cpuregs.h>
|
||||
#include <mips/vmparam.h>
|
||||
|
||||
void
|
||||
_kvm_freevtop(kd)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_ns32k.c,v 1.13 2000/10/10 20:44:17 he Exp $ */
|
||||
/* $NetBSD: kvm_ns32k.c,v 1.14 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_ns32k.c,v 1.13 2000/10/10 20:44:17 he Exp $");
|
||||
__RCSID("$NetBSD: kvm_ns32k.c,v 1.14 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -74,6 +74,7 @@ __RCSID("$NetBSD: kvm_ns32k.c,v 1.13 2000/10/10 20:44:17 he Exp $");
|
|||
|
||||
#include <machine/pte.h>
|
||||
#include <machine/kcore.h>
|
||||
#include <machine/vmparam.h>
|
||||
|
||||
#ifndef btop
|
||||
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_powerpc.c,v 1.5 2000/06/29 06:34:25 mrg Exp $ */
|
||||
/* $NetBSD: kvm_powerpc.c,v 1.6 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 1996 Wolfgang Solfrank.
|
||||
|
|
@ -36,6 +36,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/exec.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
|
|
@ -89,10 +90,19 @@ int
|
|||
_kvm_mdopen(kd)
|
||||
kvm_t *kd;
|
||||
{
|
||||
uintptr_t max_uva;
|
||||
extern struct ps_strings *__ps_strings;
|
||||
|
||||
#if 0 /* XXX - These vary across powerpc machines... */
|
||||
kd->usrstack = USRSTACK;
|
||||
kd->min_uva = VM_MIN_ADDRESS;
|
||||
kd->max_uva = VM_MAXUSER_ADDRESS;
|
||||
#endif
|
||||
/* This is somewhat hack-ish, but it works. */
|
||||
max_uva = (uintptr_t) (__ps_strings + 1);
|
||||
kd->usrstack = max_uva;
|
||||
kd->max_uva = max_uva;
|
||||
kd->min_uva = 0;
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_sh3.c,v 1.3 2000/06/29 06:34:26 mrg Exp $ */
|
||||
/* $NetBSD: kvm_sh3.c,v 1.4 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_sh3.c,v 1.3 2000/06/29 06:34:26 mrg Exp $");
|
||||
__RCSID("$NetBSD: kvm_sh3.c,v 1.4 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -68,6 +68,7 @@ __RCSID("$NetBSD: kvm_sh3.c,v 1.3 2000/06/29 06:34:26 mrg Exp $");
|
|||
#include "kvm_private.h"
|
||||
|
||||
#include <machine/pte.h>
|
||||
#include <machine/vmparam.h>
|
||||
|
||||
#ifndef btop
|
||||
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_sparc.c,v 1.24 2000/10/04 18:12:01 sommerfeld Exp $ */
|
||||
/* $NetBSD: kvm_sparc.c,v 1.25 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_sparc.c,v 1.24 2000/10/04 18:12:01 sommerfeld Exp $");
|
||||
__RCSID("$NetBSD: kvm_sparc.c,v 1.25 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -64,6 +64,7 @@ __RCSID("$NetBSD: kvm_sparc.c,v 1.24 2000/10/04 18:12:01 sommerfeld Exp $");
|
|||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/kcore.h>
|
||||
|
||||
#include <limits.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_sparc64.c,v 1.6 2000/10/10 20:44:17 he Exp $ */
|
||||
/* $NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_sparc64.c,v 1.6 2000/10/10 20:44:17 he Exp $");
|
||||
__RCSID("$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -64,6 +64,7 @@ __RCSID("$NetBSD: kvm_sparc64.c,v 1.6 2000/10/10 20:44:17 he Exp $");
|
|||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/kcore.h>
|
||||
|
||||
#include <limits.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kvm_x86_64.c,v 1.1 2001/06/19 00:43:24 fvdl Exp $ */
|
||||
/* $NetBSD: kvm_x86_64.c,v 1.2 2001/08/05 03:33:16 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_x86_64.c,v 1.1 2001/06/19 00:43:24 fvdl Exp $");
|
||||
__RCSID("$NetBSD: kvm_x86_64.c,v 1.2 2001/08/05 03:33:16 matt Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
|
|
@ -68,7 +68,9 @@ __RCSID("$NetBSD: kvm_x86_64.c,v 1.1 2001/06/19 00:43:24 fvdl Exp $");
|
|||
|
||||
#include "kvm_private.h"
|
||||
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/pte.h>
|
||||
#include <machine/vmparam.h>
|
||||
|
||||
#ifndef btop
|
||||
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uvm_param.h,v 1.11 2001/07/14 06:36:03 matt Exp $ */
|
||||
/* $NetBSD: uvm_param.h,v 1.12 2001/08/05 03:33:16 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -71,7 +71,9 @@
|
|||
#ifndef _VM_PARAM_
|
||||
#define _VM_PARAM_
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include <machine/vmparam.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This belongs in types.h, but breaks too many existing programs.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uvm_pmap.h,v 1.7 2001/05/25 04:06:17 chs Exp $ */
|
||||
/* $NetBSD: uvm_pmap.h,v 1.8 2001/08/05 03:33:16 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -86,7 +86,9 @@ struct pmap_statistics {
|
|||
};
|
||||
typedef struct pmap_statistics *pmap_statistics_t;
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include <machine/pmap.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Flags passed to pmap_enter(). Note the bottom 3 bits are VM_PROT_*
|
||||
|
|
|
|||
Loading…
Reference in New Issue