Module Name: src
Committed By: riz
Date: Fri Jul 20 23:12:48 UTC 2012
Modified Files:
src/sys/compat/linux32/arch/amd64 [netbsd-6]: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
syscalls.master
Log Message:
Pull up following revision(s) (requested by christos in ticket #424):
sys/compat/linux32/arch/amd64/linux32_syscallargs.h: revision 1.67
sys/compat/linux32/arch/amd64/syscalls.master: revision 1.62
sys/compat/linux32/arch/amd64/linux32_syscall.h: revision 1.67
sys/compat/linux32/arch/amd64/linux32_sysent.c: revision 1.67
sys/compat/linux32/arch/amd64/linux32_syscalls.c: revision 1.67
add xattr stubs
regen
To generate a diff of this commit:
cvs rdiff -u -r1.65.6.1 -r1.65.6.2 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.60.6.1 -r1.60.6.2 \
src/sys/compat/linux32/arch/amd64/syscalls.master
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/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.1 Sat May 19 15:19:42 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Fri Jul 20 23:12:47 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -564,6 +564,42 @@
/* syscall: "gettid" ret: "pid_t" args: */
#define LINUX32_SYS_gettid 224
+/* syscall: "setxattr" ret: "int" args: "char *" "char *" "void *" "size_t" "int" */
+#define LINUX32_SYS_setxattr 226
+
+/* syscall: "lsetxattr" ret: "int" args: "char *" "char *" "void *" "size_t" "int" */
+#define LINUX32_SYS_lsetxattr 227
+
+/* syscall: "fsetxattr" ret: "int" args: "int" "char *" "void *" "size_t" "int" */
+#define LINUX32_SYS_fsetxattr 228
+
+/* syscall: "getxattr" ret: "ssize_t" args: "char *" "char *" "void *" "size_t" */
+#define LINUX32_SYS_getxattr 229
+
+/* syscall: "lgetxattr" ret: "ssize_t" args: "char *" "char *" "void *" "size_t" */
+#define LINUX32_SYS_lgetxattr 230
+
+/* syscall: "fgetxattr" ret: "ssize_t" args: "int" "char *" "void *" "size_t" */
+#define LINUX32_SYS_fgetxattr 231
+
+/* syscall: "listxattr" ret: "ssize_t" args: "char *" "char *" "size_t" */
+#define LINUX32_SYS_listxattr 232
+
+/* syscall: "llistxattr" ret: "ssize_t" args: "char *" "char *" "size_t" */
+#define LINUX32_SYS_llistxattr 233
+
+/* syscall: "flistxattr" ret: "ssize_t" args: "int" "char *" "size_t" */
+#define LINUX32_SYS_flistxattr 234
+
+/* syscall: "removexattr" ret: "int" args: "char *" "char *" */
+#define LINUX32_SYS_removexattr 235
+
+/* syscall: "lremovexattr" ret: "int" args: "char *" "char *" */
+#define LINUX32_SYS_lremovexattr 236
+
+/* syscall: "fremovexattr" ret: "int" args: "int" "char *" */
+#define LINUX32_SYS_fremovexattr 237
+
/* syscall: "tkill" ret: "int" args: "int" "int" */
#define LINUX32_SYS_tkill 238
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.1 Sat May 19 15:19:42 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Fri Jul 20 23:12:47 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -768,6 +768,30 @@ check_syscall_args(linux32_sys_getdents6
struct linux32_sys_fcntl64_args;
+struct linux_sys_setxattr_args;
+
+struct linux_sys_lsetxattr_args;
+
+struct linux_sys_fsetxattr_args;
+
+struct linux_sys_getxattr_args;
+
+struct linux_sys_lgetxattr_args;
+
+struct linux_sys_fgetxattr_args;
+
+struct linux_sys_listxattr_args;
+
+struct linux_sys_llistxattr_args;
+
+struct linux_sys_flistxattr_args;
+
+struct linux_sys_removexattr_args;
+
+struct linux_sys_lremovexattr_args;
+
+struct linux_sys_fremovexattr_args;
+
struct linux32_sys_tkill_args {
syscallarg(int) tid;
syscallarg(int) sig;
@@ -1260,6 +1284,30 @@ int linux32_sys_fcntl64(struct lwp *, co
int linux_sys_gettid(struct lwp *, const void *, register_t *);
+int linux_sys_setxattr(struct lwp *, const struct linux_sys_setxattr_args *, register_t *);
+
+int linux_sys_lsetxattr(struct lwp *, const struct linux_sys_lsetxattr_args *, register_t *);
+
+int linux_sys_fsetxattr(struct lwp *, const struct linux_sys_fsetxattr_args *, register_t *);
+
+int linux_sys_getxattr(struct lwp *, const struct linux_sys_getxattr_args *, register_t *);
+
+int linux_sys_lgetxattr(struct lwp *, const struct linux_sys_lgetxattr_args *, register_t *);
+
+int linux_sys_fgetxattr(struct lwp *, const struct linux_sys_fgetxattr_args *, register_t *);
+
+int linux_sys_listxattr(struct lwp *, const struct linux_sys_listxattr_args *, register_t *);
+
+int linux_sys_llistxattr(struct lwp *, const struct linux_sys_llistxattr_args *, register_t *);
+
+int linux_sys_flistxattr(struct lwp *, const struct linux_sys_flistxattr_args *, register_t *);
+
+int linux_sys_removexattr(struct lwp *, const struct linux_sys_removexattr_args *, register_t *);
+
+int linux_sys_lremovexattr(struct lwp *, const struct linux_sys_lremovexattr_args *, register_t *);
+
+int linux_sys_fremovexattr(struct lwp *, const struct linux_sys_fremovexattr_args *, register_t *);
+
int linux32_sys_tkill(struct lwp *, const struct linux32_sys_tkill_args *, register_t *);
int linux32_sys_futex(struct lwp *, const struct linux32_sys_futex_args *, register_t *);
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.65.6.1 Sat May 19 15:19:43 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Fri Jul 20 23:12:47 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.65.6.1 2012/05/19 15:19:43 riz Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.65.6.1 2012/05/19 15:19:43 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -263,18 +263,18 @@ const char *const linux32_syscallnames[]
/* 223 */ "#223 (unimplemented / * unused * /)",
/* 224 */ "gettid",
/* 225 */ "#225 (unimplemented readahead)",
- /* 226 */ "#226 (unimplemented setxattr)",
- /* 227 */ "#227 (unimplemented lsetxattr)",
- /* 228 */ "#228 (unimplemented fsetxattr)",
- /* 229 */ "#229 (unimplemented getxattr)",
- /* 230 */ "#230 (unimplemented lgetxattr)",
- /* 231 */ "#231 (unimplemented fgetxattr)",
- /* 232 */ "#232 (unimplemented listxattr)",
- /* 233 */ "#233 (unimplemented llistxattr)",
- /* 234 */ "#234 (unimplemented flistxattr)",
- /* 235 */ "#235 (unimplemented removexattr)",
- /* 236 */ "#236 (unimplemented lremovexattr)",
- /* 237 */ "#237 (unimplemented fremovexattr)",
+ /* 226 */ "setxattr",
+ /* 227 */ "lsetxattr",
+ /* 228 */ "fsetxattr",
+ /* 229 */ "getxattr",
+ /* 230 */ "lgetxattr",
+ /* 231 */ "fgetxattr",
+ /* 232 */ "listxattr",
+ /* 233 */ "llistxattr",
+ /* 234 */ "flistxattr",
+ /* 235 */ "removexattr",
+ /* 236 */ "lremovexattr",
+ /* 237 */ "fremovexattr",
/* 238 */ "tkill",
/* 239 */ "#239 (unimplemented sendfile64)",
/* 240 */ "futex",
Index: src/sys/compat/linux32/arch/amd64/linux32_sysent.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.65.6.1 Sat May 19 15:19:43 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_sysent.c Fri Jul 20 23:12:47 2012
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.65.6.1 2012/05/19 15:19:43 riz Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.65.6.1 2012/05/19 15:19:43 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -491,30 +491,30 @@ struct sysent linux32_sysent[] = {
(sy_call_t *)linux_sys_gettid }, /* 224 = gettid */
{ 0, 0, 0,
linux_sys_nosys }, /* 225 = unimplemented readahead */
- { 0, 0, 0,
- linux_sys_nosys }, /* 226 = unimplemented setxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 227 = unimplemented lsetxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 228 = unimplemented fsetxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 229 = unimplemented getxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 230 = unimplemented lgetxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 231 = unimplemented fgetxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 232 = unimplemented listxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 233 = unimplemented llistxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 234 = unimplemented flistxattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 235 = unimplemented removexattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 236 = unimplemented lremovexattr */
- { 0, 0, 0,
- linux_sys_nosys }, /* 237 = unimplemented fremovexattr */
+ { ns(struct linux_sys_setxattr_args), 0,
+ (sy_call_t *)linux_sys_setxattr }, /* 226 = setxattr */
+ { ns(struct linux_sys_lsetxattr_args), 0,
+ (sy_call_t *)linux_sys_lsetxattr }, /* 227 = lsetxattr */
+ { ns(struct linux_sys_fsetxattr_args), 0,
+ (sy_call_t *)linux_sys_fsetxattr }, /* 228 = fsetxattr */
+ { ns(struct linux_sys_getxattr_args), 0,
+ (sy_call_t *)linux_sys_getxattr }, /* 229 = getxattr */
+ { ns(struct linux_sys_lgetxattr_args), 0,
+ (sy_call_t *)linux_sys_lgetxattr }, /* 230 = lgetxattr */
+ { ns(struct linux_sys_fgetxattr_args), 0,
+ (sy_call_t *)linux_sys_fgetxattr }, /* 231 = fgetxattr */
+ { ns(struct linux_sys_listxattr_args), 0,
+ (sy_call_t *)linux_sys_listxattr }, /* 232 = listxattr */
+ { ns(struct linux_sys_llistxattr_args), 0,
+ (sy_call_t *)linux_sys_llistxattr },/* 233 = llistxattr */
+ { ns(struct linux_sys_flistxattr_args), 0,
+ (sy_call_t *)linux_sys_flistxattr },/* 234 = flistxattr */
+ { ns(struct linux_sys_removexattr_args), 0,
+ (sy_call_t *)linux_sys_removexattr },/* 235 = removexattr */
+ { ns(struct linux_sys_lremovexattr_args), 0,
+ (sy_call_t *)linux_sys_lremovexattr },/* 236 = lremovexattr */
+ { ns(struct linux_sys_fremovexattr_args), 0,
+ (sy_call_t *)linux_sys_fremovexattr },/* 237 = fremovexattr */
{ ns(struct linux32_sys_tkill_args), 0,
(sy_call_t *)linux32_sys_tkill }, /* 238 = tkill */
{ 0, 0, 0,
Index: src/sys/compat/linux32/arch/amd64/syscalls.master
diff -u src/sys/compat/linux32/arch/amd64/syscalls.master:1.60.6.1 src/sys/compat/linux32/arch/amd64/syscalls.master:1.60.6.2
--- src/sys/compat/linux32/arch/amd64/syscalls.master:1.60.6.1 Sat May 19 15:19:42 2012
+++ src/sys/compat/linux32/arch/amd64/syscalls.master Fri Jul 20 23:12:47 2012
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.60.6.1 2012/05/19 15:19:42 riz Exp $
+ $NetBSD: syscalls.master,v 1.60.6.2 2012/07/20 23:12:47 riz Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
; (See syscalls.conf to see what it is processed into.)
@@ -400,18 +400,27 @@
223 UNIMPL /* unused */
224 NOARGS { pid_t|linux_sys||gettid(void); }
225 UNIMPL readahead
-226 UNIMPL setxattr
-227 UNIMPL lsetxattr
-228 UNIMPL fsetxattr
-229 UNIMPL getxattr
-230 UNIMPL lgetxattr
-231 UNIMPL fgetxattr
-232 UNIMPL listxattr
-233 UNIMPL llistxattr
-234 UNIMPL flistxattr
-235 UNIMPL removexattr
-236 UNIMPL lremovexattr
-237 UNIMPL fremovexattr
+226 NOARGS { int|linux_sys||setxattr(char *path, char *name, \
+ void *value, size_t size, int flags); }
+227 NOARGS { int|linux_sys||lsetxattr(char *path, char *name, \
+ void *value, size_t size, int flags); }
+228 NOARGS { int|linux_sys||fsetxattr(int fd, char *name, \
+ void *value, size_t size, int flags); }
+229 NOARGS { ssize_t|linux_sys||getxattr(char *path, char *name, \
+ void *value, size_t size); }
+230 NOARGS { ssize_t|linux_sys||lgetxattr(char *path, char *name, \
+ void *value, size_t size); }
+231 NOARGS { ssize_t|linux_sys||fgetxattr(int fd, char *name, \
+ void *value, size_t size); }
+232 NOARGS { ssize_t|linux_sys||listxattr(char *path, char *list, \
+ size_t size); }
+233 NOARGS { ssize_t|linux_sys||llistxattr(char *path, char *list, \
+ size_t size); }
+234 NOARGS { ssize_t|linux_sys||flistxattr(int fd, char *list, \
+ size_t size); }
+235 NOARGS { int|linux_sys||removexattr(char *path, char *name); }
+236 NOARGS { int|linux_sys||lremovexattr(char *path, char *name); }
+237 NOARGS { int|linux_sys||fremovexattr(int fd, char *name); }
238 STD { int|linux32_sys||tkill(int tid, int sig); }
239 UNIMPL sendfile64
240 STD { int|linux32_sys||futex(linux32_intp_t uaddr, int op, int val, \
