Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix inconsistent names

This commit is contained in:
christos 2015-03-08 17:10:44 +00:00
parent f771842a14
commit 65af340dc3
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/linux32/arch/amd64/linux32_signal.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux32_signal.h,v 1.3 2011/11/18 04:08:56 christos Exp $ */
/* $NetBSD: linux32_signal.h,v 1.4 2015/03/08 17:10:44 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@ -36,7 +36,7 @@
#define native_to_linux32_signo native_to_linux_signo
#define linux32_to_native_signo linux_to_native_signo
typedef netbsd32_pointer_t linux32_handler_t;
typedef netbsd32_pointer_t linux32_handlerp_t;
typedef netbsd32_pointer_t linux32_restorer_t;
typedef netbsd32_pointer_t linux32_siginfop_t;
typedef netbsd32_pointer_t linux32_ucontextp_t;
@ -85,7 +85,7 @@ typedef struct {
} linux32_sigset_t;
struct linux32_sigaction {
linux32_handler_t linux_sa_handler;
linux32_handlerp_t linux_sa_handler;
u_int32_t linux_sa_flags;
linux32_restorer_t linux_sa_restorer;
linux32_sigset_t linux_sa_mask;
@ -156,13 +156,13 @@ struct linux32_rt_sigframe {
linux32_ucontextp_t sf_ucp;
struct linux32_siginfo sf_si;
struct linux32_ucontext sf_uc;
linux32_handler_t sf_handler;
linux32_handlerp_t sf_handler;
};
struct linux32_sigframe {
int sf_sig;
struct linux32_sigcontext sf_sc;
linux32_handler_t sf_handler;
linux32_handlerp_t sf_handler;
};
#endif /* _AMD64_LINUX32_SIGNAL_H_ */

8
sys/compat/linux32/arch/amd64/syscalls.master
View File

@ -1,4 +1,4 @@
$NetBSD: syscalls.master,v 1.68 2014/11/22 13:12:22 njoly Exp $
$NetBSD: syscalls.master,v 1.69 2015/03/08 17:10:44 christos Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
; (See syscalls.conf to see what it is processed into.)
@ -88,7 +88,7 @@
17 STD { int|linux32_sys||break(netbsd32_charp nsize); }
18 OBSOL ostat
19 NOARGS { netbsd32_long|compat_43_netbsd32||olseek(int fd, \
netbsd32_long offset, int chence); }
netbsd32_long offset, int whence); }
20 NOARGS { pid_t|sys||getpid(void); }
21 UNIMPL mount
22 UNIMPL umount
@ -122,7 +122,7 @@
46 NOARGS linux_setgid16 { int|netbsd32||setgid(gid_t gid); }
47 NOARGS linux_getgid16 { gid_t|sys||getgid(void); }
48 STD { int|linux32_sys||signal(int signum, \
linux32_handler_t handler); }
linux32_handlerp_t handler); }
49 NOARGS linux_geteuid16 { uid_t|sys||geteuid(void); }
50 NOARGS linux_getegid16 { gid_t|sys||getegid(void); }
51 NOARGS { int|netbsd32||acct(netbsd32_charp path); }
@ -174,7 +174,7 @@
netbsd32_charp link); }
84 NOARGS { int|compat_43_netbsd32||lstat43(netbsd32_charp \
path, netbsd32_stat43p_t ub); }
85 NOARGS { int|netbsd32||readlink(netbsd32_charp name, \
85 NOARGS { int|netbsd32||readlink(netbsd32_charp path, \
netbsd32_charp buf, netbsd32_size_t count); }
86 UNIMPL uselib
87 STD { int|linux32_sys||swapon(netbsd32_charp name); }

6
sys/compat/linux32/common/linux32_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux32_signal.c,v 1.17 2013/11/18 01:32:52 chs Exp $ */
/* $NetBSD: linux32_signal.c,v 1.18 2015/03/08 17:10:44 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.17 2013/11/18 01:32:52 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.18 2015/03/08 17:10:44 christos Exp $");
#include <sys/param.h>
#include <sys/ucred.h>
@ -501,7 +501,7 @@ linux32_sys_signal(struct lwp *l, const struct linux32_sys_signal_args *uap, reg
{
/* {
syscallarg(int) signum;
syscallarg(linux32_handler_t) handler;
syscallarg(linux32_handlerp_t) handler;
} */
struct sigaction nbsa, obsa;
int error, sig;