Module Name: src
Committed By: christos
Date: Sun Apr 10 15:48:01 UTC 2011
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
Log Message:
Regen: XXX: produces errors because of rump changes!
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 \
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
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.60 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.61
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.60 Tue Nov 2 14:15:39 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Sun Apr 10 11:48:01 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.60 2010/11/02 18:15:39 chs Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.61 2011/04/10 15:48:01 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
+ * created from NetBSD: syscalls.master,v 1.58 2011/04/10 15:47:21 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -612,6 +612,12 @@
/* syscall: "get_robust_list" ret: "int" args: "linux32_pid_t" "linux32_robust_list_headpp_t" "linux32_sizep_t" */
#define LINUX32_SYS_get_robust_list 312
+/* syscall: "dup3" ret: "int" args: "int" "int" "int" */
+#define LINUX32_SYS_dup3 330
+
+/* syscall: "pipe2" ret: "int" args: "netbsd32_intp" "int" */
+#define LINUX32_SYS_pipe2 331
+
#define LINUX32_SYS_MAXSYSCALL 338
#define LINUX32_SYS_NSYSENT 512
#endif /* _LINUX32_SYS_SYSCALL_H_ */
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.60 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.61
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.60 Tue Nov 2 14:15:39 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Sun Apr 10 11:48:01 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.60 2010/11/02 18:15:39 chs Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.61 2011/04/10 15:48:01 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
+ * created from NetBSD: syscalls.master,v 1.58 2011/04/10 15:47:21 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -27,7 +27,7 @@
}
#undef check_syscall_args
-#define check_syscall_args(call) \
+#define check_syscall_args(call) /*LINTED*/ \
typedef char call##_check_args[sizeof (struct call##_args) \
<= LINUX32_SYS_MAXSYSARGS * sizeof (register32_t) ? 1 : -1];
@@ -871,6 +871,19 @@
};
check_syscall_args(linux32_sys_get_robust_list)
+struct linux32_sys_dup3_args {
+ syscallarg(int) from;
+ syscallarg(int) to;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux32_sys_dup3)
+
+struct linux32_sys_pipe2_args {
+ syscallarg(netbsd32_intp) fd;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux32_sys_pipe2)
+
/*
* System call prototypes.
*/
@@ -1253,4 +1266,8 @@
int linux32_sys_get_robust_list(struct lwp *, const struct linux32_sys_get_robust_list_args *, register_t *);
+int linux32_sys_dup3(struct lwp *, const struct linux32_sys_dup3_args *, register_t *);
+
+int linux32_sys_pipe2(struct lwp *, const struct linux32_sys_pipe2_args *, register_t *);
+
#endif /* _LINUX32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.60 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.61
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.60 Tue Nov 2 14:15:39 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Sun Apr 10 11:48:01 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.60 2010/11/02 18:15:39 chs Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.61 2011/04/10 15:48:01 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
+ * created from NetBSD: syscalls.master,v 1.58 2011/04/10 15:47:21 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.60 2010/11/02 18:15:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.61 2011/04/10 15:48:01 christos Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -367,12 +367,186 @@
/* 327 */ "#327 (unimplemented signalfd4)",
/* 328 */ "#328 (unimplemented eventfd2)",
/* 329 */ "#329 (unimplemented epoll_create1)",
- /* 330 */ "#330 (unimplemented dup3)",
- /* 331 */ "#331 (unimplemented pipe2)",
+ /* 330 */ "dup3",
+ /* 331 */ "pipe2",
/* 332 */ "#332 (unimplemented inotify_init1)",
/* 333 */ "#333 (unimplemented preadv)",
/* 334 */ "#334 (unimplemented pwritev)",
/* 335 */ "#335 (unimplemented rt_tgsigqueueinfo)",
/* 336 */ "#336 (unimplemented perf_counter_open)",
/* 337 */ "#337 (unimplemented recvmmsg)",
+ /* 338 */ "# filler",
+ /* 339 */ "# filler",
+ /* 340 */ "# filler",
+ /* 341 */ "# filler",
+ /* 342 */ "# filler",
+ /* 343 */ "# filler",
+ /* 344 */ "# filler",
+ /* 345 */ "# filler",
+ /* 346 */ "# filler",
+ /* 347 */ "# filler",
+ /* 348 */ "# filler",
+ /* 349 */ "# filler",
+ /* 350 */ "# filler",
+ /* 351 */ "# filler",
+ /* 352 */ "# filler",
+ /* 353 */ "# filler",
+ /* 354 */ "# filler",
+ /* 355 */ "# filler",
+ /* 356 */ "# filler",
+ /* 357 */ "# filler",
+ /* 358 */ "# filler",
+ /* 359 */ "# filler",
+ /* 360 */ "# filler",
+ /* 361 */ "# filler",
+ /* 362 */ "# filler",
+ /* 363 */ "# filler",
+ /* 364 */ "# filler",
+ /* 365 */ "# filler",
+ /* 366 */ "# filler",
+ /* 367 */ "# filler",
+ /* 368 */ "# filler",
+ /* 369 */ "# filler",
+ /* 370 */ "# filler",
+ /* 371 */ "# filler",
+ /* 372 */ "# filler",
+ /* 373 */ "# filler",
+ /* 374 */ "# filler",
+ /* 375 */ "# filler",
+ /* 376 */ "# filler",
+ /* 377 */ "# filler",
+ /* 378 */ "# filler",
+ /* 379 */ "# filler",
+ /* 380 */ "# filler",
+ /* 381 */ "# filler",
+ /* 382 */ "# filler",
+ /* 383 */ "# filler",
+ /* 384 */ "# filler",
+ /* 385 */ "# filler",
+ /* 386 */ "# filler",
+ /* 387 */ "# filler",
+ /* 388 */ "# filler",
+ /* 389 */ "# filler",
+ /* 390 */ "# filler",
+ /* 391 */ "# filler",
+ /* 392 */ "# filler",
+ /* 393 */ "# filler",
+ /* 394 */ "# filler",
+ /* 395 */ "# filler",
+ /* 396 */ "# filler",
+ /* 397 */ "# filler",
+ /* 398 */ "# filler",
+ /* 399 */ "# filler",
+ /* 400 */ "# filler",
+ /* 401 */ "# filler",
+ /* 402 */ "# filler",
+ /* 403 */ "# filler",
+ /* 404 */ "# filler",
+ /* 405 */ "# filler",
+ /* 406 */ "# filler",
+ /* 407 */ "# filler",
+ /* 408 */ "# filler",
+ /* 409 */ "# filler",
+ /* 410 */ "# filler",
+ /* 411 */ "# filler",
+ /* 412 */ "# filler",
+ /* 413 */ "# filler",
+ /* 414 */ "# filler",
+ /* 415 */ "# filler",
+ /* 416 */ "# filler",
+ /* 417 */ "# filler",
+ /* 418 */ "# filler",
+ /* 419 */ "# filler",
+ /* 420 */ "# filler",
+ /* 421 */ "# filler",
+ /* 422 */ "# filler",
+ /* 423 */ "# filler",
+ /* 424 */ "# filler",
+ /* 425 */ "# filler",
+ /* 426 */ "# filler",
+ /* 427 */ "# filler",
+ /* 428 */ "# filler",
+ /* 429 */ "# filler",
+ /* 430 */ "# filler",
+ /* 431 */ "# filler",
+ /* 432 */ "# filler",
+ /* 433 */ "# filler",
+ /* 434 */ "# filler",
+ /* 435 */ "# filler",
+ /* 436 */ "# filler",
+ /* 437 */ "# filler",
+ /* 438 */ "# filler",
+ /* 439 */ "# filler",
+ /* 440 */ "# filler",
+ /* 441 */ "# filler",
+ /* 442 */ "# filler",
+ /* 443 */ "# filler",
+ /* 444 */ "# filler",
+ /* 445 */ "# filler",
+ /* 446 */ "# filler",
+ /* 447 */ "# filler",
+ /* 448 */ "# filler",
+ /* 449 */ "# filler",
+ /* 450 */ "# filler",
+ /* 451 */ "# filler",
+ /* 452 */ "# filler",
+ /* 453 */ "# filler",
+ /* 454 */ "# filler",
+ /* 455 */ "# filler",
+ /* 456 */ "# filler",
+ /* 457 */ "# filler",
+ /* 458 */ "# filler",
+ /* 459 */ "# filler",
+ /* 460 */ "# filler",
+ /* 461 */ "# filler",
+ /* 462 */ "# filler",
+ /* 463 */ "# filler",
+ /* 464 */ "# filler",
+ /* 465 */ "# filler",
+ /* 466 */ "# filler",
+ /* 467 */ "# filler",
+ /* 468 */ "# filler",
+ /* 469 */ "# filler",
+ /* 470 */ "# filler",
+ /* 471 */ "# filler",
+ /* 472 */ "# filler",
+ /* 473 */ "# filler",
+ /* 474 */ "# filler",
+ /* 475 */ "# filler",
+ /* 476 */ "# filler",
+ /* 477 */ "# filler",
+ /* 478 */ "# filler",
+ /* 479 */ "# filler",
+ /* 480 */ "# filler",
+ /* 481 */ "# filler",
+ /* 482 */ "# filler",
+ /* 483 */ "# filler",
+ /* 484 */ "# filler",
+ /* 485 */ "# filler",
+ /* 486 */ "# filler",
+ /* 487 */ "# filler",
+ /* 488 */ "# filler",
+ /* 489 */ "# filler",
+ /* 490 */ "# filler",
+ /* 491 */ "# filler",
+ /* 492 */ "# filler",
+ /* 493 */ "# filler",
+ /* 494 */ "# filler",
+ /* 495 */ "# filler",
+ /* 496 */ "# filler",
+ /* 497 */ "# filler",
+ /* 498 */ "# filler",
+ /* 499 */ "# filler",
+ /* 500 */ "# filler",
+ /* 501 */ "# filler",
+ /* 502 */ "# filler",
+ /* 503 */ "# filler",
+ /* 504 */ "# filler",
+ /* 505 */ "# filler",
+ /* 506 */ "# filler",
+ /* 507 */ "# filler",
+ /* 508 */ "# filler",
+ /* 509 */ "# filler",
+ /* 510 */ "# filler",
+ /* 511 */ "# filler",
};
Index: src/sys/compat/linux32/arch/amd64/linux32_sysent.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.60 src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.61
--- src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.60 Tue Nov 2 14:15:39 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_sysent.c Sun Apr 10 11:48:01 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.60 2010/11/02 18:15:39 chs Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.61 2011/04/10 15:48:01 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
+ * created from NetBSD: syscalls.master,v 1.58 2011/04/10 15:47:21 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.60 2010/11/02 18:15:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.61 2011/04/10 15:48:01 christos Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -699,10 +699,10 @@
linux_sys_nosys }, /* 328 = unimplemented eventfd2 */
{ 0, 0, 0,
linux_sys_nosys }, /* 329 = unimplemented epoll_create1 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 330 = unimplemented dup3 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 331 = unimplemented pipe2 */
+ { ns(struct linux32_sys_dup3_args), 0,
+ (sy_call_t *)linux32_sys_dup3 }, /* 330 = dup3 */
+ { ns(struct linux32_sys_pipe2_args), 0,
+ (sy_call_t *)linux32_sys_pipe2 }, /* 331 = pipe2 */
{ 0, 0, 0,
linux_sys_nosys }, /* 332 = unimplemented inotify_init1 */
{ 0, 0, 0,
