Wed Oct 27 15:50:03 2010 UTC ()
Remove old crud which is no longer used (since kern_proc).


(pooka)
diff -r1.189 -r1.190 src/sys/rump/librump/rumpkern/rump.c
cvs diff -r1.189 -r1.190 src/sys/rump/librump/rumpkern/rump.c (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/rump.c 2010/10/25 17:49:36 1.189
+++ src/sys/rump/librump/rumpkern/rump.c 2010/10/27 15:50:03 1.190
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rump.c,v 1.189 2010/10/25 17:49:36 pooka Exp $ */ 1/* $NetBSD: rump.c,v 1.190 2010/10/27 15:50:03 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2007 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Development of this software was supported by Google Summer of Code. 6 * Development of this software was supported by Google Summer of Code.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -18,27 +18,27 @@ @@ -18,27 +18,27 @@
18 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 18 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.189 2010/10/25 17:49:36 pooka Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.190 2010/10/27 15:50:03 pooka Exp $");
32 32
33#include <sys/systm.h> 33#include <sys/systm.h>
34#define ELFSIZE ARCH_ELFSIZE 34#define ELFSIZE ARCH_ELFSIZE
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/atomic.h> 37#include <sys/atomic.h>
38#include <sys/buf.h> 38#include <sys/buf.h>
39#include <sys/callout.h> 39#include <sys/callout.h>
40#include <sys/conf.h> 40#include <sys/conf.h>
41#include <sys/cpu.h> 41#include <sys/cpu.h>
42#include <sys/device.h> 42#include <sys/device.h>
43#include <sys/evcnt.h> 43#include <sys/evcnt.h>
44#include <sys/event.h> 44#include <sys/event.h>
@@ -74,42 +74,27 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.1 @@ -74,42 +74,27 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.1
74 74
75#include <secmodel/suser/suser.h> 75#include <secmodel/suser/suser.h>
76 76
77#include <prop/proplib.h> 77#include <prop/proplib.h>
78 78
79#include <uvm/uvm_extern.h> 79#include <uvm/uvm_extern.h>
80#include <uvm/uvm_readahead.h> 80#include <uvm/uvm_readahead.h>
81 81
82#include "rump_private.h" 82#include "rump_private.h"
83#include "rump_net_private.h" 83#include "rump_net_private.h"
84#include "rump_vfs_private.h" 84#include "rump_vfs_private.h"
85#include "rump_dev_private.h" 85#include "rump_dev_private.h"
86 86
87/* is this still necessary or use kern_proc stuff? */ 
88struct session rump_session = { 
89 .s_count = 1, 
90 .s_flags = 0, 
91 .s_leader = &proc0, 
92 .s_login = "rumphobo", 
93 .s_sid = 0, 
94}; 
95struct pgrp rump_pgrp = { 
96 .pg_members = LIST_HEAD_INITIALIZER(pg_members), 
97 .pg_session = &rump_session, 
98 .pg_jobc = 1, 
99}; 
100 
101char machine[] = MACHINE; 87char machine[] = MACHINE;
102static kauth_cred_t rump_susercred; 
103 88
104/* pretend the master rump proc is init */ 89/* pretend the master rump proc is init */
105struct proc *initproc = &proc0; 90struct proc *initproc = &proc0;
106 91
107struct rumpuser_mtx *rump_giantlock; 92struct rumpuser_mtx *rump_giantlock;
108 93
109struct device rump_rootdev = { 94struct device rump_rootdev = {
110 .dv_class = DV_VIRTUAL 95 .dv_class = DV_VIRTUAL
111}; 96};
112 97
113#ifdef RUMP_WITHOUT_THREADS 98#ifdef RUMP_WITHOUT_THREADS
114int rump_threads = 0; 99int rump_threads = 0;
115#else 100#else
@@ -294,27 +279,26 @@ rump__init(int rump_version) @@ -294,27 +279,26 @@ rump__init(int rump_version)
294 pool_subsystem_init(); 279 pool_subsystem_init();
295 kmem_init(); 280 kmem_init();
296 281
297 uvm_ra_init(); 282 uvm_ra_init();
298 uao_init(); 283 uao_init();
299 284
300 mutex_obj_init(); 285 mutex_obj_init();
301 callout_startup(); 286 callout_startup();
302 287
303 kprintf_init(); 288 kprintf_init();
304 loginit(); 289 loginit();
305 290
306 kauth_init(); 291 kauth_init();
307 rump_susercred = rump_cred_create(0, 0, 0, NULL); 
308 292
309 procinit(); 293 procinit();
310 proc0_init(); 294 proc0_init();
311 295
312 l->l_proc = &proc0; 296 l->l_proc = &proc0;
313 lwp_update_creds(l); 297 lwp_update_creds(l);
314 298
315 lwpinit_specificdata(); 299 lwpinit_specificdata();
316 lwp_initspecific(&lwp0); 300 lwp_initspecific(&lwp0);
317 301
318 rump_scheduler_init(numcpu); 302 rump_scheduler_init(numcpu);
319 /* revert temporary context and schedule a real context */ 303 /* revert temporary context and schedule a real context */
320 l->l_cpu = NULL; 304 l->l_cpu = NULL;