diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/mem.c | 13 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pccons.c | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c index e2dfe79fd2e..c3070705798 100644 --- a/sys/arch/i386/i386/mem.c +++ b/sys/arch/i386/i386/mem.c @@ -1,5 +1,5 @@ /* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */ -/* $OpenBSD: mem.c,v 1.19 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: mem.c,v 1.20 2001/11/01 12:13:46 art Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990, 1993 @@ -222,10 +222,11 @@ mmrw(dev, uio, flags) return (error); } -int +paddr_t mmmmap(dev, off, prot) dev_t dev; - int off, prot; + off_t off; + int prot; { struct proc *p = curproc; /* XXX */ @@ -237,12 +238,6 @@ mmmmap(dev, off, prot) return -1; return i386_btop((u_int)off); -/* minor device 1 is kernel memory */ - case 1: - /* XXX - writability, executability checks? */ - if (!uvm_kernacc((caddr_t)off, NBPG, B_READ)) - return -1; - return i386_btop(vtophys(off)); #ifdef APERTURE /* minor device 4 is aperture driver */ case 4: diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c index 3f3f19879e9..ce9e6a98eb7 100644 --- a/sys/arch/i386/isa/pccons.c +++ b/sys/arch/i386/isa/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.47 2001/05/16 05:07:48 millert Exp $ */ +/* $OpenBSD: pccons.c,v 1.48 2001/11/01 12:13:46 art Exp $ */ /* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */ /*- @@ -1890,10 +1890,10 @@ loop: goto top; } -int +paddr_t pcmmap(dev, offset, nprot) dev_t dev; - int offset; + off_t offset; int nprot; { |