diff options
| author |   oga <oga@openbsd.org> | 2010-05-01 13:13:08 +0000 |
|---|---|---|
| committer | oga <oga@openbsd.org> | 2010-05-01 13:13:08 +0000 |
| commit | e6250aa7c6520b5dc50d1b95296db42b837e96b0 (patch) | |
| tree | 8373c333061b291d3234f17ef0df2a0c62a32a40 | |
| parent | split up a multiple assignment so we aren't casting an lvalue. (diff) | |
| download | wireguard-openbsd-e6250aa7c6520b5dc50d1b95296db42b837e96b0.tar.xz wireguard-openbsd-e6250aa7c6520b5dc50d1b95296db42b837e96b0.zip | |
Unbreak ramdisks.
I forgot that uvm_object.c wasn't build if SMALL_KERNEL. Fix this by building
the file unconditionally and only building the less used functions when
SMALL_KERNEL is not defined.
unbreaks ramdisk build. ok jsg@
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/uvm/uvm_object.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index 9c06c5eabb2..02f86c125ed 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.487 2010/04/22 19:02:52 oga Exp $ +# $OpenBSD: files,v 1.488 2010/05/01 13:13:08 oga Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -1004,7 +1004,7 @@ file uvm/uvm_km.c file uvm/uvm_map.c file uvm/uvm_meter.c file uvm/uvm_mmap.c -file uvm/uvm_object.c !small_kernel +file uvm/uvm_object.c file uvm/uvm_page.c file uvm/uvm_pager.c file uvm/uvm_pdaemon.c diff --git a/sys/uvm/uvm_object.c b/sys/uvm/uvm_object.c index cc7871b8a5f..ffd76a259e5 100644 --- a/sys/uvm/uvm_object.c +++ b/sys/uvm/uvm_object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_object.c,v 1.5 2010/04/30 21:56:39 oga Exp $ */ +/* $OpenBSD: uvm_object.c,v 1.6 2010/05/01 13:13:10 oga Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -54,6 +54,7 @@ uvm_objinit(struct uvm_object *uobj, struct uvm_pagerops *pgops, int refs) uobj->uo_refs = refs; } +#ifndef SMALL_KERNEL /* * uvm_objwire: wire the pages of entire uobj * @@ -168,3 +169,4 @@ uvm_objunwire(struct uvm_object *uobj, off_t start, off_t end) uvm_unlock_pageq(); simple_unlock(&uobj->vmobjlock); } +#endif /* !SMALL_KERNEL */ |