summaryrefslogtreecommitdiff
path: root/sys/vm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_extern.h6
-rw-r--r--sys/vm/vm_map.c28
-rw-r--r--sys/vm/vm_mmap.c5
-rw-r--r--sys/vm/vm_object.c16
-rw-r--r--sys/vm/vm_page.c4
-rw-r--r--sys/vm/vm_page.h7
6 files changed, 36 insertions, 30 deletions
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index a7d2dfea9f1f..34deba7d0f78 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vm_extern.h 8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.36 1997/12/31 02:35:29 alex Exp $
+ * $Id: vm_extern.h,v 1.37 1998/01/22 17:30:32 dyson Exp $
*/
#ifndef _VM_EXTERN_H_
@@ -61,7 +61,7 @@ int swapon __P((struct proc *, void *, int *));
#endif
void faultin __P((struct proc *p));
-int grow __P((struct proc *, u_int));
+int grow __P((struct proc *, size_t));
int kernacc __P((caddr_t, int, int));
vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t));
vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t));
@@ -96,7 +96,7 @@ void vnode_pager_umount __P((struct mount *));
void vnode_pager_uncache __P((struct vnode *, struct proc *));
void vslock __P((caddr_t, u_int));
void vsunlock __P((caddr_t, u_int, int));
-void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
+void vm_object_print __P((/* db_expr_t */ long, boolean_t, /* db_expr_t */ long,
char *));
void vm_fault_quick __P((caddr_t v, int prot));
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 24c028a86755..44fc57f99df2 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_map.c,v 1.126 1998/05/16 23:03:20 dyson Exp $
+ * $Id: vm_map.c,v 1.127 1998/05/21 07:47:55 dyson Exp $
*/
/*
@@ -2844,9 +2844,9 @@ DB_SHOW_COMMAND(map, vm_map_print)
vm_map_entry_t entry;
- db_iprintf("%s map 0x%x: pmap=0x%x, nentries=%d, version=%d\n",
+ db_iprintf("%s map 0x%lx: pmap=0x%lx, nentries=%d, version=%d\n",
(map->is_main_map ? "Task" : "Share"),
- (int) map, (int) (map->pmap), map->nentries,
+ (long) map, (long) (map->pmap), map->nentries,
map->timestamp);
nlines++;
@@ -2865,8 +2865,8 @@ DB_SHOW_COMMAND(map, vm_map_print)
}
#endif
- db_iprintf("map entry 0x%x: start=0x%x, end=0x%x\n",
- (int) entry, (int) entry->start, (int) entry->end);
+ db_iprintf("map entry 0x%x: start=0x%lx, end=0x%lx\n",
+ (long) entry, (long) entry->start, (long) entry->end);
nlines++;
if (map->is_main_map) {
static char *inheritance_name[4] =
@@ -2880,23 +2880,23 @@ DB_SHOW_COMMAND(map, vm_map_print)
db_printf(", wired");
}
if (entry->eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) {
- db_printf(", share=0x%x, offset=0x%x\n",
- (int) entry->object.share_map,
- (int) entry->offset);
+ db_printf(", share=0x%lx, offset=0x%lx\n",
+ (long) entry->object.share_map,
+ (long) entry->offset);
nlines++;
if ((entry->prev == &map->header) ||
((entry->prev->eflags & MAP_ENTRY_IS_A_MAP) == 0) ||
(entry->prev->object.share_map !=
entry->object.share_map)) {
db_indent += 2;
- vm_map_print((int)entry->object.share_map,
+ vm_map_print((long)entry->object.share_map,
full, 0, (char *)0);
db_indent -= 2;
}
} else {
- db_printf(", object=0x%x, offset=0x%x",
- (int) entry->object.vm_object,
- (int) entry->offset);
+ db_printf(", object=0x%lx, offset=0x%lx",
+ (long) entry->object.vm_object,
+ (long) entry->offset);
if (entry->eflags & MAP_ENTRY_COW)
db_printf(", copy (%s)",
(entry->eflags & MAP_ENTRY_NEEDS_COPY) ? "needed" : "done");
@@ -2908,7 +2908,7 @@ DB_SHOW_COMMAND(map, vm_map_print)
(entry->prev->object.vm_object !=
entry->object.vm_object)) {
db_indent += 2;
- vm_object_print((int)entry->object.vm_object,
+ vm_object_print((long)entry->object.vm_object,
full, 0, (char *)0);
nlines += 4;
db_indent -= 2;
@@ -2934,7 +2934,7 @@ DB_SHOW_COMMAND(procvm, procvm)
printf("p = 0x%x, vmspace = 0x%x, map = 0x%x, pmap = 0x%x\n",
p, p->p_vmspace, &p->p_vmspace->vm_map, &p->p_vmspace->vm_pmap);
- vm_map_print ((int) &p->p_vmspace->vm_map, 1, 0, NULL);
+ vm_map_print ((long) &p->p_vmspace->vm_map, 1, 0, NULL);
}
#endif /* DDB */
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 979755e736b7..6bf7e1c6538a 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
* from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
*
* @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.76 1998/05/18 18:26:27 guido Exp $
+ * $Id: vm_mmap.c,v 1.77 1998/05/19 07:13:21 peter Exp $
*/
/*
@@ -60,6 +60,7 @@
#include <sys/conf.h>
#include <sys/stat.h>
#include <sys/vmmeter.h>
+#include <sys/resourcevar.h>
#include <miscfs/specfs/specdev.h>
@@ -970,7 +971,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
vp = (struct vnode *) handle;
if (vp->v_type == VCHR) {
type = OBJT_DEVICE;
- handle = (void *)vp->v_rdev;
+ handle = (void *)(long)vp->v_rdev;
} else {
struct vattr vat;
int error;
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index df91aa0125b0..550dc44dfab5 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_object.c,v 1.120 1998/04/29 04:28:09 dyson Exp $
+ * $Id: vm_object.c,v 1.121 1998/05/21 07:47:58 dyson Exp $
*/
/*
@@ -1596,16 +1596,16 @@ DB_SHOW_COMMAND(object, vm_object_print_static)
if (object == NULL)
return;
- db_iprintf("Object 0x%x: type=%d, size=0x%x, res=%d, ref=%d, flags=0x%x\n",
- (int) object, (int) object->type, (int) object->size,
+ db_iprintf("Object 0x%lx: type=%d, size=0x%lx, res=%d, ref=%d, flags=0x%x\n",
+ (long) object, (int) object->type, (long) object->size,
object->resident_page_count,
object->ref_count,
object->flags);
- db_iprintf(" sref=%d, offset=0x%x, backing_object(%d)=(0x%x)+0x%x\n",
+ db_iprintf(" sref=%d, offset=0x%x, backing_object(%d)=(0x%lx)+0x%x\n",
object->shadow_count,
(int) object->paging_offset,
- (((int)object->backing_object)?object->backing_object->ref_count:0),
- (int) object->backing_object,
+ (((long)object->backing_object)?object->backing_object->ref_count:0),
+ (long) object->backing_object,
(int) object->backing_object_offset);
if (!full)
@@ -1638,9 +1638,9 @@ DB_SHOW_COMMAND(object, vm_object_print_static)
/* XXX need this non-static entry for calling from vm_map_print. */
void
vm_object_print(addr, have_addr, count, modif)
- db_expr_t addr;
+ /* db_expr_t */ long addr;
boolean_t have_addr;
- db_expr_t count;
+ /* db_expr_t */ long count;
char *modif;
{
vm_object_print_static(addr, have_addr, count, modif);
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index d07ce44ea3fa..72661f683673 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91
- * $Id: vm_page.c,v 1.99 1998/05/02 03:02:13 peter Exp $
+ * $Id: vm_page.c,v 1.100 1998/06/02 05:50:08 dyson Exp $
*/
/*
@@ -359,7 +359,7 @@ vm_page_hash(object, pindex)
vm_object_t object;
vm_pindex_t pindex;
{
- return ((((unsigned) object) >> 5) + (pindex >> 1)) & vm_page_hash_mask;
+ return ((((unsigned long) object) >> 5) + (pindex >> 1)) & vm_page_hash_mask;
}
/*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 51cbf761a2c3..b2c5ffd03bc3 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_page.h,v 1.38 1998/03/07 21:37:15 dyson Exp $
+ * $Id: vm_page.h,v 1.39 1998/05/24 04:25:27 dyson Exp $
*/
/*
@@ -116,8 +116,13 @@ struct vm_page {
u_char busy; /* page busy count */
/* NOTE that these must support one bit per DEV_BSIZE in a page!!! */
/* so, on normal X86 kernels, they must be at least 8 bits wide */
+#if PAGE_SIZE == 4096
u_char valid; /* map of valid DEV_BSIZE chunks */
u_char dirty; /* map of dirty DEV_BSIZE chunks */
+#elif PAGE_SIZE == 8192
+ u_short valid; /* map of valid DEV_BSIZE chunks */
+ u_short dirty; /* map of dirty DEV_BSIZE chunks */
+#endif
};
/*
generated by cgit v1.3 (git 2.53.0) at 2026-07-25 23:52:34 +0000