| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: rump.c,v 1.220 2011/01/22 13:41:22 pooka Exp $ */ | | 1 | /* $NetBSD: rump.c,v 1.221 2011/01/22 18:33:25 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.220 2011/01/22 13:41:22 pooka Exp $"); | | 31 | __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.221 2011/01/22 18:33:25 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> |
| @@ -784,27 +784,27 @@ rump_proxy_procexit(void) | | | @@ -784,27 +784,27 @@ rump_proxy_procexit(void) |
784 | | | 784 | |
785 | mutex_enter(p->p_lock); | | 785 | mutex_enter(p->p_lock); |
786 | LIST_FOREACH(l, &p->p_lwps, l_sibling) { | | 786 | LIST_FOREACH(l, &p->p_lwps, l_sibling) { |
787 | if (l->l_private) | | 787 | if (l->l_private) |
788 | cv_broadcast(l->l_private); | | 788 | cv_broadcast(l->l_private); |
789 | l->l_stat = LSZOMB; | | 789 | l->l_stat = LSZOMB; |
790 | } | | 790 | } |
791 | cv_broadcast(&p->p_waitcv); | | 791 | cv_broadcast(&p->p_waitcv); |
792 | mutex_exit(p->p_lock); | | 792 | mutex_exit(p->p_lock); |
793 | | | 793 | |
794 | /* | | 794 | /* |
795 | * Don't wait for lwps to exit. There's refcounting in the | | 795 | * Don't wait for lwps to exit. There's refcounting in the |
796 | * rumpuser sp code which makes this safe. Also, this routine | | 796 | * rumpuser sp code which makes this safe. Also, this routine |
797 | * should sleep for a long time. | | 797 | * should not sleep for a long time. |
798 | */ | | 798 | */ |
799 | } | | 799 | } |
800 | | | 800 | |
801 | int | | 801 | int |
802 | rump_boot_gethowto() | | 802 | rump_boot_gethowto() |
803 | { | | 803 | { |
804 | | | 804 | |
805 | return boothowto; | | 805 | return boothowto; |
806 | } | | 806 | } |
807 | | | 807 | |
808 | void | | 808 | void |
809 | rump_boot_sethowto(int howto) | | 809 | rump_boot_sethowto(int howto) |
810 | { | | 810 | { |