summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/vm/kern_lock.c4
-rw-r--r--sys/vm/swap_pager.c13
-rw-r--r--sys/vm/vm_extern.h4
-rw-r--r--sys/vm/vm_fault.c4
-rw-r--r--sys/vm/vm_glue.c10
-rw-r--r--sys/vm/vm_map.c33
-rw-r--r--sys/vm/vm_mmap.c20
-rw-r--r--sys/vm/vm_object.c8
-rw-r--r--sys/vm/vm_page.c8
-rw-r--r--sys/vm/vm_unix.c16
10 files changed, 56 insertions, 64 deletions
diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c
index d5c87beee1e..6e856bc9c7b 100644
--- a/sys/vm/kern_lock.c
+++ b/sys/vm/kern_lock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_lock.c,v 1.5 1997/04/17 01:25:16 niklas Exp $ */
+/* $OpenBSD: kern_lock.c,v 1.6 1997/07/25 06:03:03 mickey Exp $ */
/* $NetBSD: kern_lock.c,v 1.10 1994/10/30 19:11:09 cgd Exp $ */
/*
@@ -136,7 +136,7 @@ void simple_unlock(l)
boolean_t simple_lock_try(l)
simple_lock_t l;
{
- return (!test_and_set((boolean_t *)l));
+ return (!test_and_set((boolean_t *)l));
}
#endif /* notdef */
#endif /* NCPUS > 1 */
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 4774428adcb..d15302ad1e3 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swap_pager.c,v 1.10 1997/04/17 01:25:16 niklas Exp $ */
+/* $OpenBSD: swap_pager.c,v 1.11 1997/07/25 06:03:04 mickey Exp $ */
/* $NetBSD: swap_pager.c,v 1.27 1996/03/16 23:15:20 christos Exp $ */
/*
@@ -202,13 +202,13 @@ swap_pager_init()
/*
* Calculate the swap allocation constants.
*/
- if (dmmin == 0) {
- dmmin = DMMIN;
+ if (dmmin == 0) {
+ dmmin = DMMIN;
if (dmmin < CLBYTES/DEV_BSIZE)
dmmin = CLBYTES/DEV_BSIZE;
}
- if (dmmax == 0)
- dmmax = DMMAX;
+ if (dmmax == 0)
+ dmmax = DMMAX;
/*
* Fill in our table of object size vs. allocation size
@@ -735,8 +735,7 @@ swap_pager_io(swp, mlist, npages, flags)
if ((swpagerdebug & SDB_ALLOCBLK) &&
(swb->swb_mask & mask) != mask)
printf("swpg_io: %p write %d pages at %x+%lx\n",
- swp->sw_blocks, npages, swb->swb_block,
- atop(off));
+ swp->sw_blocks, npages, swb->swb_block, atop(off));
if (swpagerdebug & SDB_CLUSTER)
printf("swpg_io: off=%lx, npg=%x, mask=%x, bmask=%x\n",
off, npages, mask, swb->swb_mask);
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 964adb26dec..8f09389aae1 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_extern.h,v 1.10 1997/04/17 01:25:17 niklas Exp $ */
+/* $OpenBSD: vm_extern.h,v 1.11 1997/07/25 06:03:05 mickey Exp $ */
/* $NetBSD: vm_extern.h,v 1.20 1996/04/23 12:25:23 christos Exp $ */
/*-
@@ -103,7 +103,7 @@ void thread_sleep_msg __P((void *, simple_lock_t,
/* backwards compatibility */
#define thread_sleep(event, lock, ruptible) \
- thread_sleep_msg((event), (lock), (ruptible), "thrd_sleep")
+ thread_sleep_msg((event), (lock), (ruptible), "thrd_sleep")
/*
* This define replaces a thread_wakeup prototype, as thread_wakeup
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 5a28eb128ab..8811995f3af 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_fault.c,v 1.6 1997/04/17 01:25:17 niklas Exp $ */
+/* $OpenBSD: vm_fault.c,v 1.7 1997/07/25 06:03:06 mickey Exp $ */
/* $NetBSD: vm_fault.c,v 1.18 1996/05/20 17:40:02 mrg Exp $ */
/*
@@ -180,7 +180,7 @@ vm_fault(map, vaddr, fault_type, change_wiring)
first_m = NULL;
- /*
+ /*
* Make a reference to this object to
* prevent its disposal while we are messing with
* it. Once we have the reference, the map is free
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 10ef84b937a..a3abdf369da 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_glue.c,v 1.23 1997/04/17 01:25:18 niklas Exp $ */
+/* $OpenBSD: vm_glue.c,v 1.24 1997/07/25 06:03:07 mickey Exp $ */
/* $NetBSD: vm_glue.c,v 1.55.4.1 1996/06/13 17:25:45 cgd Exp $ */
/*
@@ -320,10 +320,10 @@ vm_init_limits(p)
* any single, large process to start random page
* replacement once it fills memory.
*/
- p->p_rlimit[RLIMIT_STACK].rlim_cur = DFLSSIZ;
- p->p_rlimit[RLIMIT_STACK].rlim_max = MAXSSIZ;
- p->p_rlimit[RLIMIT_DATA].rlim_cur = DFLDSIZ;
- p->p_rlimit[RLIMIT_DATA].rlim_max = MAXDSIZ;
+ p->p_rlimit[RLIMIT_STACK].rlim_cur = DFLSSIZ;
+ p->p_rlimit[RLIMIT_STACK].rlim_max = MAXSSIZ;
+ p->p_rlimit[RLIMIT_DATA].rlim_cur = DFLDSIZ;
+ p->p_rlimit[RLIMIT_DATA].rlim_max = MAXDSIZ;
p->p_rlimit[RLIMIT_RSS].rlim_cur = ptoa(cnt.v_free_count);
}
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index af5713ea852..b96f1570623 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_map.c,v 1.4 1997/04/17 01:25:19 niklas Exp $ */
+/* $OpenBSD: vm_map.c,v 1.5 1997/07/25 06:03:07 mickey Exp $ */
/* $NetBSD: vm_map.c,v 1.23 1996/02/10 00:08:08 christos Exp $ */
/*
@@ -2583,21 +2583,21 @@ vm_map_print(map, full)
register vm_map_t map;
boolean_t full;
{
- _vm_map_print(map, full, printf);
+ _vm_map_print(map, full, printf);
}
void
_vm_map_print(map, full, pr)
register vm_map_t map;
boolean_t full;
- int (*pr) __P((const char *, ...));
+ int (*pr) __P((const char *, ...));
{
register vm_map_entry_t entry;
extern int indent;
- iprintf(pr, "%s map 0x%lx: pmap=0x%lx,ref=%d,nentries=%d,version=%d\n",
+ iprintf(pr, "%s map %p: pmap=%p, ref=%d, nentries=%d, version=%d\n",
(map->is_main_map ? "Task" : "Share"),
- (long) map, (long) (map->pmap), map->ref_count, map->nentries,
+ map, (map->pmap), map->ref_count, map->nentries,
map->timestamp);
if (!full && indent)
@@ -2606,23 +2606,23 @@ _vm_map_print(map, full, pr)
indent += 2;
for (entry = map->header.next; entry != &map->header;
entry = entry->next) {
- iprintf(pr, "map entry 0x%lx: start=0x%lx, end=0x%lx, ",
- (long) entry, (long) entry->start, (long) entry->end);
+ iprintf(pr, "map entry %p: start=%p, end=%p, ",
+ entry, entry->start, entry->end);
if (map->is_main_map) {
static char *inheritance_name[4] =
{ "share", "copy", "none", "donate_copy"};
(*pr)("prot=%x/%x/%s, ",
- entry->protection,
- entry->max_protection,
- inheritance_name[entry->inheritance]);
+ entry->protection,
+ entry->max_protection,
+ inheritance_name[entry->inheritance]);
if (entry->wired_count != 0)
(*pr)("wired, ");
}
if (entry->is_a_map || entry->is_sub_map) {
- (*pr)("share=0x%lx, offset=0x%lx\n",
- (long) entry->object.share_map,
- (long) entry->offset);
+ (*pr)("share=%p, offset=%p\n",
+ entry->object.share_map,
+ entry->offset);
if ((entry->prev == &map->header) ||
(!entry->prev->is_a_map) ||
(entry->prev->object.share_map !=
@@ -2634,12 +2634,11 @@ _vm_map_print(map, full, pr)
}
else {
- (*pr)("object=0x%lx, offset=0x%lx",
- (long) entry->object.vm_object,
- (long) entry->offset);
+ (*pr)("object=%p, offset=%p", entry->object.vm_object,
+ entry->offset);
if (entry->copy_on_write)
(*pr)(", copy (%s)",
- entry->needs_copy ? "needed" : "done");
+ entry->needs_copy ? "needed" : "done");
(*pr)("\n");
if ((entry->prev == &map->header) ||
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 0e614e86493..afba8d0181b 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_mmap.c,v 1.7 1997/01/07 05:37:37 tholo Exp $ */
+/* $OpenBSD: vm_mmap.c,v 1.8 1997/07/25 06:03:08 mickey Exp $ */
/* $NetBSD: vm_mmap.c,v 1.47 1996/03/16 23:15:23 christos Exp $ */
/*
@@ -284,8 +284,7 @@ sys_msync(p, v, retval)
size = (vm_size_t)SCARG(uap, len);
#ifdef DEBUG
if (mmapdebug & (MDB_FOLLOW|MDB_SYNC))
- printf("msync(%d): addr %lx len %lx\n",
- p->p_pid, addr, size);
+ printf("msync(%d): addr 0x%lx len %lx\n", p->p_pid, addr, size);
#endif
/*
@@ -323,7 +322,7 @@ sys_msync(p, v, retval)
}
#ifdef DEBUG
if (mmapdebug & MDB_SYNC)
- printf("msync: cleaning/flushing address range [%lx-%lx)\n",
+ printf("msync: cleaning/flushing address range [0x%lx-0x%lx)\n",
addr, addr+size);
#endif
/*
@@ -374,8 +373,7 @@ sys_munmap(p, v, retval)
size = (vm_size_t) SCARG(uap, len);
#ifdef DEBUG
if (mmapdebug & MDB_FOLLOW)
- printf("munmap(%d): addr %lx len %lx\n",
- p->p_pid, addr, size);
+ printf("munmap(%d): addr 0%lx len %lx\n", p->p_pid, addr, size);
#endif
/*
@@ -447,7 +445,7 @@ sys_mprotect(p, v, retval)
prot = SCARG(uap, prot) & VM_PROT_ALL;
#ifdef DEBUG
if (mmapdebug & MDB_FOLLOW)
- printf("mprotect(%d): addr %lx len %lx prot %d\n", p->p_pid,
+ printf("mprotect(%d): addr 0x%lx len %lx prot %d\n", p->p_pid,
addr, size, prot);
#endif
/*
@@ -491,7 +489,7 @@ sys_minherit(p, v, retval)
inherit = SCARG(uap, inherit);
#ifdef DEBUG
if (mmapdebug & MDB_FOLLOW)
- printf("minherit(%d): addr %x len %x inherit %d\n", p->p_pid,
+ printf("minherit(%d): addr 0x%lx len %lx inherit %d\n", p->p_pid,
addr, size, inherit);
#endif
/*
@@ -572,8 +570,7 @@ sys_mlock(p, v, retval)
size = (vm_size_t)SCARG(uap, len);
#ifdef DEBUG
if (mmapdebug & MDB_FOLLOW)
- printf("mlock(%d): addr %lx len %lx\n",
- p->p_pid, addr, size);
+ printf("mlock(%d): addr 0%lx len %lx\n", p->p_pid, addr, size);
#endif
/*
* Align the address to a page boundary,
@@ -621,8 +618,7 @@ sys_munlock(p, v, retval)
size = (vm_size_t)SCARG(uap, len);
#ifdef DEBUG
if (mmapdebug & MDB_FOLLOW)
- printf("munlock(%d): addr %lx len %lx\n",
- p->p_pid, addr, size);
+ printf("munlock(%d): addr 0x%lx len %lx\n", p->p_pid, addr, size);
#endif
/*
* Align the address to a page boundary,
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index c9717cc13dc..b4c7ae54454 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_object.c,v 1.16 1997/05/28 22:40:04 mickey Exp $ */
+/* $OpenBSD: vm_object.c,v 1.17 1997/07/25 06:03:09 mickey Exp $ */
/* $NetBSD: vm_object.c,v 1.46 1997/03/30 20:56:12 mycroft Exp $ */
/*-
@@ -1716,7 +1716,7 @@ vm_object_page_remove(object, start, end)
*/
boolean_t
vm_object_coalesce(prev_object, next_object, prev_offset, next_offset,
- prev_size, next_size)
+ prev_size, next_size)
register vm_object_t prev_object;
vm_object_t next_object;
vm_offset_t prev_offset, next_offset;
@@ -1785,7 +1785,7 @@ vm_object_print(object, full)
vm_object_t object;
boolean_t full;
{
- _vm_object_print(object, full, printf);
+ _vm_object_print(object, full, printf);
}
void
@@ -1806,7 +1806,7 @@ _vm_object_print(object, full, pr)
iprintf(pr, "Object 0x%p: size=0x%lx, res=%d, ref=%d, ", object,
(long)object->size, object->resident_page_count,
object->ref_count);
- (*pr)("pager=0x%p+0x%lx, shadow=(0x%p)+0x%lx\n", object->pager,
+ (*pr)("pager=%p+0x%lx, shadow=(%p)+0x%lx\n", object->pager,
(long)object->paging_offset, object->shadow,
(long)object->shadow_offset);
(*pr)("shadowers=(");
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index c3c0bf6e460..55241f87fad 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_page.c,v 1.5 1997/04/17 01:25:21 niklas Exp $ */
+/* $OpenBSD: vm_page.c,v 1.6 1997/07/25 06:03:10 mickey Exp $ */
/* $NetBSD: vm_page.c,v 1.28 1996/02/05 01:54:05 christos Exp $ */
/*
@@ -226,8 +226,8 @@ vm_page_bootstrap(startp, endp)
vm_page_buckets = (struct pglist *)
pmap_steal_memory(vm_page_bucket_count * sizeof(*vm_page_buckets));
- bucket = vm_page_buckets;
-
+ bucket = vm_page_buckets;
+
for (i = vm_page_bucket_count; i--;) {
TAILQ_INIT(bucket);
bucket++;
@@ -709,7 +709,7 @@ vm_page_rename(mem, new_object, new_offset)
vm_page_lock_queues(); /* keep page from moving out from
under pageout daemon */
- vm_page_remove(mem);
+ vm_page_remove(mem);
vm_page_insert(mem, new_object, new_offset);
vm_page_unlock_queues();
}
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index d56b60d33e2..d974d618ce6 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_unix.c,v 1.3 1997/03/29 21:17:17 tholo Exp $ */
+/* $OpenBSD: vm_unix.c,v 1.4 1997/07/25 06:03:11 mickey Exp $ */
/* $NetBSD: vm_unix.c,v 1.19 1996/02/10 00:08:14 christos Exp $ */
/*
@@ -164,10 +164,9 @@ vm_coredump(p, vp, cred, chdr)
if (!map->is_main_map) {
#ifdef DEBUG
uprintf(
- "vm_coredump: %s map 0x%lx: pmap=0x%lx,ref=%d,nentries=%d,version=%d\n",
+ "vm_coredump: %s map %p: pmap=%p, ref=%d, nentries=%d, version=%d\n",
(map->is_main_map ? "Task" : "Share"),
- (long)map, (long)(map->pmap),
- map->ref_count, map->nentries,
+ map, (map->pmap), map->ref_count, map->nentries,
map->timestamp);
#endif
return EIO;
@@ -180,10 +179,8 @@ vm_coredump(p, vp, cred, chdr)
if (entry->is_a_map || entry->is_sub_map) {
#ifdef DEBUG
- uprintf(
- "vm_coredump: entry: share=0x%lx, offset=0x%lx\n",
- (long) entry->object.share_map,
- (long) entry->offset);
+ uprintf("vm_coredump: entry: share=%p, offset=%p\n",
+ entry->object.share_map, entry->offset);
#endif
continue;
}
@@ -192,7 +189,8 @@ vm_coredump(p, vp, cred, chdr)
entry->object.vm_object->pager &&
entry->object.vm_object->pager->pg_type == PG_DEVICE) {
#ifdef DEBUG
- printf("vm_coredump: skipping dev @ %lx\n", (unsigned long)entry->start);
+ printf("vm_coredump: skipping dev @ 0x%lx\n",
+ entry->start);
#endif
continue;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 10:04:53 +0000