Module Name: src
Committed By: drochner
Date: Tue Aug 18 11:22:09 UTC 2009
Modified Files:
src/sys/compat/linux/common: linux_ipccall.c linux_ipccall.h
Log Message:
remove some "inline" from functions which are defined in a .c file
but used elsewhere -- gcc-4.4.1 doesn't like it and I doubt it
had any effect
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_ipccall.c
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux/common/linux_ipccall.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_ipccall.c
diff -u src/sys/compat/linux/common/linux_ipccall.c:1.31 src/sys/compat/linux/common/linux_ipccall.c:1.32
--- src/sys/compat/linux/common/linux_ipccall.c:1.31 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/common/linux_ipccall.c Tue Aug 18 11:22:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ipccall.c,v 1.31 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner 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.31 2008/04/28 20:23:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -160,7 +160,7 @@
}
#ifdef SYSVSEM
-inline int
+int
linux_semop(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
/* {
@@ -179,7 +179,7 @@
return sys_semop(l, &bsa, retval);
}
-inline int
+int
linux_semget(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
/* {
@@ -202,7 +202,7 @@
#ifdef SYSVMSG
-inline int
+int
linux_msgsnd(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
struct sys_msgsnd_args bma;
@@ -215,7 +215,7 @@
return sys_msgsnd(l, &bma, retval);
}
-inline int
+int
linux_msgrcv(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
struct sys_msgrcv_args bma;
@@ -234,7 +234,7 @@
return sys_msgrcv(l, &bma, retval);
}
-inline int
+int
linux_msgget(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
struct sys_msgget_args bma;
@@ -252,7 +252,7 @@
* shmdt(): this could have been mapped directly, if it wasn't for
* the extra indirection by the linux_ipc system call.
*/
-inline int
+int
linux_shmdt(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
struct sys_shmdt_args bsa;
@@ -265,7 +265,7 @@
/*
* Same story as shmdt.
*/
-inline int
+int
linux_shmget(struct lwp *l, const struct linux_sys_ipc_args *uap, register_t *retval)
{
struct linux_sys_shmget_args bsa;
Index: src/sys/compat/linux/common/linux_ipccall.h
diff -u src/sys/compat/linux/common/linux_ipccall.h:1.14 src/sys/compat/linux/common/linux_ipccall.h:1.15
--- src/sys/compat/linux/common/linux_ipccall.h:1.14 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/common/linux_ipccall.h Tue Aug 18 11:22:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ipccall.h,v 1.14 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_ipccall.h,v 1.15 2009/08/18 11:22:09 drochner Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -59,27 +59,27 @@
# ifdef SYSVSEM
-__inline int linux_semop(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_semop(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
-__inline int linux_semget(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_semget(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
# endif
# ifdef SYSVMSG
-__inline int linux_msgsnd(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_msgsnd(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
-__inline int linux_msgrcv(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_msgrcv(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
-__inline int linux_msgget(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_msgget(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
# endif
# ifdef SYSVSHM
-__inline int linux_shmdt(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_shmdt(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
-__inline int linux_shmget(struct lwp *, const struct linux_sys_ipc_args *,
+int linux_shmget(struct lwp *, const struct linux_sys_ipc_args *,
register_t *);
# endif
