Fri Sep 19 17:25:33 2014 UTC ()
#include <sys/condvar.h>


(matt)
diff -r1.10 -r1.11 src/sys/compat/netbsd32/netbsd32_sem.c
cvs diff -r1.10 -r1.11 src/sys/compat/netbsd32/netbsd32_sem.c (expand / switch to unified diff)

--- src/sys/compat/netbsd32/netbsd32_sem.c 2012/03/10 21:51:58 1.10
+++ src/sys/compat/netbsd32/netbsd32_sem.c 2014/09/19 17:25:33 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: netbsd32_sem.c,v 1.10 2012/03/10 21:51:58 joerg Exp $ */ 1/* $NetBSD: netbsd32_sem.c,v 1.11 2014/09/19 17:25:33 matt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 The NetBSD Foundation. 4 * Copyright (c) 2006 The NetBSD Foundation.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,33 +17,34 @@ @@ -17,33 +17,34 @@
17 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 17 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: netbsd32_sem.c,v 1.10 2012/03/10 21:51:58 joerg Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: netbsd32_sem.c,v 1.11 2014/09/19 17:25:33 matt Exp $");
31 31
32#include <sys/types.h> 32#include <sys/types.h>
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/systm.h> 34#include <sys/systm.h>
35#include <sys/kernel.h> 35#include <sys/kernel.h>
36#include <sys/dirent.h> 36#include <sys/dirent.h>
 37#include <sys/condvar.h>
37#include <sys/ksem.h> 38#include <sys/ksem.h>
38#include <sys/mount.h> 39#include <sys/mount.h>
39#include <sys/proc.h> 40#include <sys/proc.h>
40#include <sys/syscallargs.h> 41#include <sys/syscallargs.h>
41 42
42#include <compat/netbsd32/netbsd32.h> 43#include <compat/netbsd32/netbsd32.h>
43#include <compat/netbsd32/netbsd32_syscallargs.h> 44#include <compat/netbsd32/netbsd32_syscallargs.h>
44#include <compat/netbsd32/netbsd32_conv.h> 45#include <compat/netbsd32/netbsd32_conv.h>
45 46
46static int 47static int
47netbsd32_ksem_copyout(const void *src, void *dst, size_t size) 48netbsd32_ksem_copyout(const void *src, void *dst, size_t size)
48{ 49{
49 const intptr_t *idp = src; 50 const intptr_t *idp = src;