Mon Jan 18 23:21:28 2016 UTC ()
massively reduce header pollution from times prehistoric


(pooka)
diff -r1.175 -r1.176 src/sys/rump/librump/rumpkern/emul.c
cvs diff -r1.175 -r1.176 src/sys/rump/librump/rumpkern/emul.c (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/emul.c 2016/01/18 15:53:38 1.175
+++ src/sys/rump/librump/rumpkern/emul.c 2016/01/18 23:21:28 1.176
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: emul.c,v 1.175 2016/01/18 15:53:38 pooka Exp $ */ 1/* $NetBSD: emul.c,v 1.176 2016/01/18 23:21:28 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,62 +16,40 @@ @@ -16,62 +16,40 @@
16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.175 2016/01/18 15:53:38 pooka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.176 2016/01/18 23:21:28 pooka Exp $");
30 30
31#include <sys/param.h> 31#include <sys/param.h>
32#include <sys/null.h> 32#include <sys/cprng.h>
33#include <sys/vnode.h> 
34#include <sys/stat.h> 
35#include <sys/select.h> 
36#include <sys/syslog.h> 
37#include <sys/namei.h> 
38#include <sys/kauth.h> 
39#include <sys/kernel.h> 
40#include <sys/conf.h> 
41#include <sys/device.h> 
42#include <sys/queue.h> 
43#include <sys/file.h> 
44#include <sys/filedesc.h> 33#include <sys/filedesc.h>
45#include <sys/cpu.h> 34#include <sys/kauth.h>
46#include <sys/kmem.h> 
47#include <sys/poll.h> 
48#include <sys/timetc.h> 
49#include <sys/tprintf.h> 
50#include <sys/module.h> 35#include <sys/module.h>
51#include <sys/tty.h> 
52#include <sys/reboot.h> 36#include <sys/reboot.h>
53#include <sys/syscall.h> 37#include <sys/syscall.h>
54#include <sys/syscallvar.h> 
55#include <sys/xcall.h> 
56#include <sys/sleepq.h> 
57#include <sys/cprng.h> 
58 38
59#include <dev/cons.h> 39#include <dev/cons.h>
60 40
61#include <rump/rumpuser.h> 41#include <rump/rumpuser.h>
62 42
63#include <uvm/uvm_map.h> 
64 
65#include "rump_private.h" 43#include "rump_private.h"
66 44
67void (*rump_vfs_fini)(void) = (void *)nullop; 45void (*rump_vfs_fini)(void) = (void *)nullop;
68 46
69/* 47/*
70 * physmem is largely unused (except for nmbcluster calculations), 48 * physmem is largely unused (except for nmbcluster calculations),
71 * so pick a default value which suits ZFS. if an application wants 49 * so pick a default value which suits ZFS. if an application wants
72 * a very small memory footprint, it can still adjust this before 50 * a very small memory footprint, it can still adjust this before
73 * calling rump_init() 51 * calling rump_init()
74 */ 52 */
75#define PHYSMEM 512*256 53#define PHYSMEM 512*256
76int physmem = PHYSMEM; 54int physmem = PHYSMEM;
77int nkmempages = PHYSMEM/2; /* from le chapeau */ 55int nkmempages = PHYSMEM/2; /* from le chapeau */