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

Rename ipcall/socketcall specific defines to avoid conflict with 

syscalls definitions. No functional changes.
This commit is contained in:
njoly 2013-12-27 15:10:53 +00:00
parent 825f0d0c2c
commit 27180d99da
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/compat/linux/common/linux_ipccall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner Exp $ */
/* $NetBSD: linux_ipccall.c,v 1.33 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.33 2013/12/27 15:10:53 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@ -91,11 +91,11 @@ linux_sys_ipc(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *r
switch (SCARG(uap, what)) {
#ifdef SYSVSEM
case LINUX_SYS_semop:
case LINUX_SYS_SEMOP:
return linux_semop(l, uap, retval);
case LINUX_SYS_semget:
case LINUX_SYS_SEMGET:
return linux_semget(l, uap, retval);
case LINUX_SYS_semctl: {
case LINUX_SYS_SEMCTL: {
struct linux_sys_semctl_args bsa;
union linux_semun arg;
int error;
@ -112,13 +112,13 @@ linux_sys_ipc(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *r
}
#endif
#ifdef SYSVMSG
case LINUX_SYS_msgsnd:
case LINUX_SYS_MSGSND:
return linux_msgsnd(l, uap, retval);
case LINUX_SYS_msgrcv:
case LINUX_SYS_MSGRCV:
return linux_msgrcv(l, uap, retval);
case LINUX_SYS_msgget:
case LINUX_SYS_MSGGET:
return linux_msgget(l, uap, retval);
case LINUX_SYS_msgctl: {
case LINUX_SYS_MSGCTL: {
struct linux_sys_msgctl_args bsa;
SCARG(&bsa, msqid) = SCARG(uap, a1);
@ -129,7 +129,7 @@ linux_sys_ipc(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *r
}
#endif
#ifdef SYSVSHM
case LINUX_SYS_shmat: {
case LINUX_SYS_SHMAT: {
struct linux_sys_shmat_args bsa;
SCARG(&bsa, shmid) = SCARG(uap, a1);
@ -140,11 +140,11 @@ linux_sys_ipc(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *r
return linux_sys_shmat(l, &bsa, retval);
}
case LINUX_SYS_shmdt:
case LINUX_SYS_SHMDT:
return linux_shmdt(l, uap, retval);
case LINUX_SYS_shmget:
case LINUX_SYS_SHMGET:
return linux_shmget(l, uap, retval);
case LINUX_SYS_shmctl: {
case LINUX_SYS_SHMCTL: {
struct linux_sys_shmctl_args bsa;
SCARG(&bsa, shmid) = SCARG(uap, a1);

24
sys/compat/linux/common/linux_ipccall.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_ipccall.h,v 1.15 2009/08/18 11:22:09 drochner Exp $ */
/* $NetBSD: linux_ipccall.h,v 1.16 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -45,17 +45,17 @@
* linux_ipc() call, and based on which the actual system calls
* are made.
*/
#define LINUX_SYS_semop 1
#define LINUX_SYS_semget 2
#define LINUX_SYS_semctl 3
#define LINUX_SYS_msgsnd 11
#define LINUX_SYS_msgrcv 12
#define LINUX_SYS_msgget 13
#define LINUX_SYS_msgctl 14
#define LINUX_SYS_shmat 21
#define LINUX_SYS_shmdt 22
#define LINUX_SYS_shmget 23
#define LINUX_SYS_shmctl 24
#define LINUX_SYS_SEMOP 1
#define LINUX_SYS_SEMGET 2
#define LINUX_SYS_SEMCTL 3
#define LINUX_SYS_MSGSND 11
#define LINUX_SYS_MSGRCV 12
#define LINUX_SYS_MSGGET 13
#define LINUX_SYS_MSGCTL 14
#define LINUX_SYS_SHMAT 21
#define LINUX_SYS_SHMDT 22
#define LINUX_SYS_SHMGET 23
#define LINUX_SYS_SHMCTL 24
# ifdef SYSVSEM

40
sys/compat/linux/common/linux_socketcall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_socketcall.c,v 1.42 2012/06/22 08:47:47 martin Exp $ */
/* $NetBSD: linux_socketcall.c,v 1.43 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.42 2012/06/22 08:47:47 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.43 2013/12/27 15:10:53 njoly Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -144,7 +144,7 @@ linux_sys_socketcall(struct lwp *l, const struct linux_sys_socketcall_args *uap,
DPRINTF(("linux_socketcall('%s'): ",
linux_socketcall[SCARG(uap, what)].name));
if (SCARG(uap, what) == LINUX_SYS_socket) {
if (SCARG(uap, what) == LINUX_SYS_SOCKET) {
DPRINTF(("[dom %d type %d proto %d]\n",
lda.dummy_ints[0],
lda.dummy_ints[1],
@ -165,55 +165,55 @@ linux_sys_socketcall(struct lwp *l, const struct linux_sys_socketcall_args *uap,
#endif
switch (SCARG(uap, what)) {
case LINUX_SYS_socket:
case LINUX_SYS_SOCKET:
error = linux_sys_socket(l, (void *)&lda, retval);
break;
case LINUX_SYS_bind:
case LINUX_SYS_BIND:
error = linux_sys_bind(l, (void *)&lda, retval);
break;
case LINUX_SYS_connect:
case LINUX_SYS_CONNECT:
error = linux_sys_connect(l, (void *)&lda, retval);
break;
case LINUX_SYS_listen:
case LINUX_SYS_LISTEN:
error = sys_listen(l, (void *)&lda, retval);
break;
case LINUX_SYS_accept:
case LINUX_SYS_ACCEPT:
error = linux_sys_accept(l, (void *)&lda, retval);
break;
case LINUX_SYS_getsockname:
case LINUX_SYS_GETSOCKNAME:
error = linux_sys_getsockname(l, (void *)&lda, retval);
break;
case LINUX_SYS_getpeername:
case LINUX_SYS_GETPEERNAME:
error = linux_sys_getpeername(l, (void *)&lda, retval);
break;
case LINUX_SYS_socketpair:
case LINUX_SYS_SOCKETPAIR:
error = linux_sys_socketpair(l, (void *)&lda, retval);
break;
case LINUX_SYS_send:
case LINUX_SYS_SEND:
error = linux_sys_send(l, (void *)&lda, retval);
break;
case LINUX_SYS_recv:
case LINUX_SYS_RECV:
error = linux_sys_recv(l, (void *)&lda, retval);
break;
case LINUX_SYS_sendto:
case LINUX_SYS_SENDTO:
error = linux_sys_sendto(l, (void *)&lda, retval);
break;
case LINUX_SYS_recvfrom:
case LINUX_SYS_RECVFROM:
error = linux_sys_recvfrom(l, (void *)&lda, retval);
break;
case LINUX_SYS_shutdown:
case LINUX_SYS_SHUTDOWN:
error = sys_shutdown(l, (void *)&lda, retval);
break;
case LINUX_SYS_setsockopt:
case LINUX_SYS_SETSOCKOPT:
error = linux_sys_setsockopt(l, (void *)&lda, retval);
break;
case LINUX_SYS_getsockopt:
case LINUX_SYS_GETSOCKOPT:
error = linux_sys_getsockopt(l, (void *)&lda, retval);
break;
case LINUX_SYS_sendmsg:
case LINUX_SYS_SENDMSG:
error = linux_sys_sendmsg(l, (void *)&lda, retval);
break;
case LINUX_SYS_recvmsg:
case LINUX_SYS_RECVMSG:
error = linux_sys_recvmsg(l, (void *)&lda, retval);
break;
default:

36
sys/compat/linux/common/linux_socketcall.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_socketcall.h,v 1.16 2009/06/17 14:18:51 njoly Exp $ */
/* $NetBSD: linux_socketcall.h,v 1.17 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -74,23 +74,23 @@
* action to take.
*/
#define LINUX_SYS_socket 1
#define LINUX_SYS_bind 2
#define LINUX_SYS_connect 3
#define LINUX_SYS_listen 4
#define LINUX_SYS_accept 5
#define LINUX_SYS_getsockname 6
#define LINUX_SYS_getpeername 7
#define LINUX_SYS_socketpair 8
#define LINUX_SYS_send 9
#define LINUX_SYS_recv 10
#define LINUX_SYS_sendto 11
#define LINUX_SYS_recvfrom 12
#define LINUX_SYS_shutdown 13
#define LINUX_SYS_setsockopt 14
#define LINUX_SYS_getsockopt 15
#define LINUX_SYS_sendmsg 16
#define LINUX_SYS_recvmsg 17
#define LINUX_SYS_SOCKET 1
#define LINUX_SYS_BIND 2
#define LINUX_SYS_CONNECT 3
#define LINUX_SYS_LISTEN 4
#define LINUX_SYS_ACCEPT 5
#define LINUX_SYS_GETSOCKNAME 6
#define LINUX_SYS_GETPEERNAME 7
#define LINUX_SYS_SOCKETPAIR 8
#define LINUX_SYS_SEND 9
#define LINUX_SYS_RECV 10
#define LINUX_SYS_SENDTO 11
#define LINUX_SYS_RECVFROM 12
#define LINUX_SYS_SHUTDOWN 13
#define LINUX_SYS_SETSOCKOPT 14
#define LINUX_SYS_GETSOCKOPT 15
#define LINUX_SYS_SENDMSG 16
#define LINUX_SYS_RECVMSG 17
#define LINUX_MAX_SOCKETCALL 17