diff options
| -rw-r--r-- | sys/arch/i386/i386/vm_machdep.c | 19 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/vm_machdep.c | 18 | ||||
| -rw-r--r-- | sys/sys/buf.h | 13 |
3 files changed, 8 insertions, 42 deletions
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c index 7bc934d292f..4276feffa6b 100644 --- a/sys/arch/i386/i386/vm_machdep.c +++ b/sys/arch/i386/i386/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.48 2007/02/20 21:15:01 tom Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.49 2007/02/24 11:59:45 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */ /*- @@ -282,22 +282,7 @@ kvtop(caddr_t addr) } /* - * Map an IO request into kernel virtual address space. Requests fall into - * one of five catagories: - * - * B_PHYS|B_UAREA: User u-area swap. - * Address is relative to start of u-area (p_addr). - * B_PHYS|B_PAGET: User page table swap. - * Address is a kernel VA in usrpt (Usrptmap). - * B_PHYS|B_DIRTY: Dirty page push. - * Address is a VA in proc2's address space. - * B_PHYS|B_PGIN: Kernel pagein of user pages. - * Address is VA in user's address space. - * B_PHYS: User "raw" IO request. - * Address is VA in user's address space. - * - * All requests are (re)mapped into kernel VA space via the useriomap - * (a name with only slightly more meaning than "kernelmap") + * Map an user IO request into kernel virtual address space. */ void vmapbuf(struct buf *bp, vsize_t len) diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c index 064de806864..45ccc5c2383 100644 --- a/sys/arch/mips64/mips64/vm_machdep.c +++ b/sys/arch/mips64/mips64/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.8 2006/11/29 12:26:13 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.9 2007/02/24 11:59:47 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -210,21 +210,7 @@ pagemove(from, to, size) extern vm_map_t phys_map; /* - * Map an IO request into kernel virtual address space. Requests fall into - * one of five catagories: - * - * B_PHYS|B_UAREA: User u-area swap. - * Address is relative to start of u-area (p_addr). - * B_PHYS|B_PAGET: User page table swap. - * Address is a kernel VA in usrpt (Usrptmap). - * B_PHYS|B_DIRTY: Dirty page push. - * Address is a VA in proc2's address space. - * B_PHYS|B_PGIN: Kernel pagein of user pages. - * Address is VA in user's address space. - * B_PHYS: User "raw" IO request. - * Address is VA in user's address space. - * - * All requests are (re)mapped into kernel VA space via the phys_map + * Map an user IO request into kernel virtual address space. */ #define trunc_page_align(x) ((vaddr_t)(x) & ~(CpuCacheAliasMask | PAGE_SIZE)) diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 15a7cde33e4..14c36bed23a 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.h,v 1.53 2006/10/21 18:09:52 thib Exp $ */ +/* $OpenBSD: buf.h,v 1.54 2007/02/24 11:59:47 miod Exp $ */ /* $NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $ */ /* @@ -147,19 +147,14 @@ struct buf *bufq_default_get(struct bufq *); #define B_CACHE 0x00000020 /* Bread found us in the cache. */ #define B_CALL 0x00000040 /* Call b_iodone from biodone. */ #define B_DELWRI 0x00000080 /* Delay I/O until buffer reused. */ -#define B_DIRTY 0x00000100 /* Dirty page to be pushed out async. */ #define B_DONE 0x00000200 /* I/O completed. */ #define B_EINTR 0x00000400 /* I/O was interrupted */ #define B_ERROR 0x00000800 /* I/O error occurred. */ #define B_INVAL 0x00002000 /* Does not contain valid info. */ #define B_NOCACHE 0x00008000 /* Do not cache block after use. */ -#define B_PAGET 0x00010000 /* Page in/out of page table space. */ -#define B_PGIN 0x00020000 /* Pagein op, so swap() can count it. */ #define B_PHYS 0x00040000 /* I/O to user memory. */ #define B_RAW 0x00080000 /* Set by physio for raw transfers. */ #define B_READ 0x00100000 /* Read buffer. */ -#define B_TAPE 0x00200000 /* Magnetic tape I/O. */ -#define B_UAREA 0x00400000 /* Buffer describes Uarea I/O. */ #define B_WANTED 0x00800000 /* Process wants this buffer. */ #define B_WRITE 0x00000000 /* Write buffer (pseudo flag). */ #define B_WRITEINPROG 0x01000000 /* Write in progress. */ @@ -169,9 +164,9 @@ struct buf *bufq_default_get(struct bufq *); #define B_PDAEMON 0x10000000 /* I/O started by pagedaemon */ #define B_BITS "\010\001AGE\002NEEDCOMMIT\003ASYNC\004BAD\005BUSY\006CACHE" \ - "\007CALL\010DELWRI\011DIRTY\012DONE\013EINTR\014ERROR" \ - "\016INVAL\020NOCACHE\021PAGET\022PGIN\023PHYS\024RAW\025READ" \ - "\026TAPE\027UAREA\030WANTED\031WRITEINPROG\032XXX\033DEFERRED" \ + "\007CALL\010DELWRI\012DONE\013EINTR\014ERROR" \ + "\016INVAL\020NOCACHE\023PHYS\024RAW\025READ" \ + "\030WANTED\031WRITEINPROG\032XXX\033DEFERRED" \ "\034SCANNED\035PDAEMON" /* |