Module Name: src
Committed By: pooka
Date: Tue Mar 2 19:37:03 UTC 2010
Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen: lfs megamaid syscalls -> MODULAR
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.235 -r1.236 src/sys/kern/syscalls.c
cvs rdiff -u -r1.231 -r1.232 src/sys/sys/syscall.h
cvs rdiff -u -r1.213 -r1.214 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.244 src/sys/kern/init_sysent.c:1.245
--- src/sys/kern/init_sysent.c:1.244 Tue Jan 5 15:25:33 2010
+++ src/sys/kern/init_sysent.c Tue Mar 2 19:37:02 2010
@@ -1,19 +1,18 @@
-/* $NetBSD: init_sysent.c,v 1.244 2010/01/05 15:25:33 skrll Exp $ */
+/* $NetBSD: init_sysent.c,v 1.245 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.244 2010/01/05 15:25:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.245 2010/03/02 19:37:02 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
-#include "fs_lfs.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signal.h>
@@ -492,25 +491,14 @@
(sy_call_t *)sys_setegid }, /* 182 = setegid */
{ ns(struct sys_seteuid_args), 0,
(sy_call_t *)sys_seteuid }, /* 183 = seteuid */
-#if defined(LFS) || !defined(_KERNEL)
{ ns(struct sys_lfs_bmapv_args), 0,
- (sy_call_t *)sys_lfs_bmapv }, /* 184 = lfs_bmapv */
+ (sy_call_t *)sys_nomodule }, /* 184 = lfs_bmapv */
{ ns(struct sys_lfs_markv_args), 0,
- (sy_call_t *)sys_lfs_markv }, /* 185 = lfs_markv */
+ (sy_call_t *)sys_nomodule }, /* 185 = lfs_markv */
{ ns(struct sys_lfs_segclean_args), 0,
- (sy_call_t *)sys_lfs_segclean }, /* 186 = lfs_segclean */
+ (sy_call_t *)sys_nomodule }, /* 186 = lfs_segclean */
{ ns(struct compat_50_sys_lfs_segwait_args), 0,
(sy_call_t *)sys_nomodule }, /* 187 = compat_50_lfs_segwait */
-#else
- { 0, 0, 0,
- sys_nosys }, /* 184 = excluded lfs_bmapv */
- { 0, 0, 0,
- sys_nosys }, /* 185 = excluded lfs_markv */
- { 0, 0, 0,
- sys_nosys }, /* 186 = excluded lfs_segclean */
- { 0, 0, 0,
- sys_nosys }, /* 187 = excluded lfs_segwait */
-#endif
{ ns(struct compat_12_sys_stat_args), 0,
(sy_call_t *)sys_nomodule }, /* 188 = compat_12_stat12 */
{ ns(struct compat_12_sys_fstat_args), 0,
@@ -1027,13 +1015,8 @@
(sy_call_t *)sys___utimes50 }, /* 420 = __utimes50 */
{ ns(struct sys___adjtime50_args), 0,
(sy_call_t *)sys___adjtime50 }, /* 421 = __adjtime50 */
-#if defined(LFS) || !defined(_KERNEL)
{ ns(struct sys___lfs_segwait50_args), 0,
- (sy_call_t *)sys___lfs_segwait50 }, /* 422 = __lfs_segwait50 */
-#else
- { 0, 0, 0,
- sys_nosys }, /* 422 = excluded __lfs_segwait50 */
-#endif
+ (sy_call_t *)sys_nomodule }, /* 422 = __lfs_segwait50 */
{ ns(struct sys___futimes50_args), 0,
(sy_call_t *)sys___futimes50 }, /* 423 = __futimes50 */
{ ns(struct sys___lutimes50_args), 0,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.235 src/sys/kern/syscalls.c:1.236
--- src/sys/kern/syscalls.c:1.235 Tue Jan 5 15:25:33 2010
+++ src/sys/kern/syscalls.c Tue Mar 2 19:37:02 2010
@@ -1,20 +1,19 @@
-/* $NetBSD: syscalls.c,v 1.235 2010/01/05 15:25:33 skrll Exp $ */
+/* $NetBSD: syscalls.c,v 1.236 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.235 2010/01/05 15:25:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.236 2010/03/02 19:37:02 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
-#include "fs_lfs.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signal.h>
@@ -224,17 +223,10 @@
/* 181 */ "setgid",
/* 182 */ "setegid",
/* 183 */ "seteuid",
-#if defined(LFS) || !defined(_KERNEL)
/* 184 */ "lfs_bmapv",
/* 185 */ "lfs_markv",
/* 186 */ "lfs_segclean",
/* 187 */ "compat_50_lfs_segwait",
-#else
- /* 184 */ "#184 (excluded lfs_bmapv)",
- /* 185 */ "#185 (excluded lfs_markv)",
- /* 186 */ "#186 (excluded lfs_segclean)",
- /* 187 */ "#187 (excluded lfs_segwait)",
-#endif
/* 188 */ "compat_12_stat12",
/* 189 */ "compat_12_fstat12",
/* 190 */ "compat_12_lstat12",
@@ -502,11 +494,7 @@
/* 419 */ "__settimeofday50",
/* 420 */ "__utimes50",
/* 421 */ "__adjtime50",
-#if defined(LFS) || !defined(_KERNEL)
/* 422 */ "__lfs_segwait50",
-#else
- /* 422 */ "#422 (excluded __lfs_segwait50)",
-#endif
/* 423 */ "__futimes50",
/* 424 */ "__lutimes50",
/* 425 */ "__setitimer50",
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.231 src/sys/sys/syscall.h:1.232
--- src/sys/sys/syscall.h:1.231 Tue Jan 5 15:25:32 2010
+++ src/sys/sys/syscall.h Tue Mar 2 19:37:02 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.231 2010/01/05 15:25:32 skrll Exp $ */
+/* $NetBSD: syscall.h,v 1.232 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -514,7 +514,6 @@
/* syscall: "seteuid" ret: "int" args: "uid_t" */
#define SYS_seteuid 183
-#if defined(LFS) || !defined(_KERNEL)
/* syscall: "lfs_bmapv" ret: "int" args: "fsid_t *" "struct block_info *" "int" */
#define SYS_lfs_bmapv 184
@@ -527,12 +526,6 @@
/* syscall: "compat_50_lfs_segwait" ret: "int" args: "fsid_t *" "struct timeval50 *" */
#define SYS_compat_50_lfs_segwait 187
-#else
- /* 184 is excluded lfs_bmapv */
- /* 185 is excluded lfs_markv */
- /* 186 is excluded lfs_segclean */
- /* 187 is excluded lfs_segwait */
-#endif
/* syscall: "compat_12_stat12" ret: "int" args: "const char *" "struct stat12 *" */
#define SYS_compat_12_stat12 188
@@ -1177,13 +1170,9 @@
/* syscall: "__adjtime50" ret: "int" args: "const struct timeval *" "struct timeval *" */
#define SYS___adjtime50 421
-#if defined(LFS) || !defined(_KERNEL)
/* syscall: "__lfs_segwait50" ret: "int" args: "fsid_t *" "struct timeval *" */
#define SYS___lfs_segwait50 422
-#else
- /* 422 is excluded __lfs_segwait50 */
-#endif
/* syscall: "__futimes50" ret: "int" args: "int" "const struct timeval *" */
#define SYS___futimes50 423
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.213 src/sys/sys/syscallargs.h:1.214
--- src/sys/sys/syscallargs.h:1.213 Tue Jan 5 15:25:32 2010
+++ src/sys/sys/syscallargs.h Tue Mar 2 19:37:02 2010
@@ -1,15 +1,17 @@
-/* $NetBSD: syscallargs.h,v 1.213 2010/01/05 15:25:32 skrll Exp $ */
+/* $NetBSD: syscallargs.h,v 1.214 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
#define _SYS_SYSCALLARGS_H_
+#include <sys/mount.h>
+
#define SYS_MAXSYSARGS 8
#undef syscallarg
@@ -952,7 +954,6 @@
syscallarg(uid_t) euid;
};
check_syscall_args(sys_seteuid)
-#if defined(LFS) || !defined(_KERNEL)
struct sys_lfs_bmapv_args {
syscallarg(fsid_t *) fsidp;
@@ -979,8 +980,6 @@
syscallarg(struct timeval50 *) tv;
};
check_syscall_args(compat_50_sys_lfs_segwait)
-#else
-#endif
struct compat_12_sys_stat_args {
syscallarg(const char *) path;
@@ -2302,15 +2301,12 @@
syscallarg(struct timeval *) olddelta;
};
check_syscall_args(sys___adjtime50)
-#if defined(LFS) || !defined(_KERNEL)
struct sys___lfs_segwait50_args {
syscallarg(fsid_t *) fsidp;
syscallarg(struct timeval *) tv;
};
check_syscall_args(sys___lfs_segwait50)
-#else
-#endif
struct sys___futimes50_args {
syscallarg(int) fd;
@@ -2862,7 +2858,6 @@
int sys_seteuid(struct lwp *, const struct sys_seteuid_args *, register_t *);
-#if defined(LFS) || !defined(_KERNEL)
int sys_lfs_bmapv(struct lwp *, const struct sys_lfs_bmapv_args *, register_t *);
int sys_lfs_markv(struct lwp *, const struct sys_lfs_markv_args *, register_t *);
@@ -2871,8 +2866,6 @@
int compat_50_sys_lfs_segwait(struct lwp *, const struct compat_50_sys_lfs_segwait_args *, register_t *);
-#else
-#endif
int compat_12_sys_stat(struct lwp *, const struct compat_12_sys_stat_args *, register_t *);
int compat_12_sys_fstat(struct lwp *, const struct compat_12_sys_fstat_args *, register_t *);
@@ -3297,11 +3290,8 @@
int sys___adjtime50(struct lwp *, const struct sys___adjtime50_args *, register_t *);
-#if defined(LFS) || !defined(_KERNEL)
int sys___lfs_segwait50(struct lwp *, const struct sys___lfs_segwait50_args *, register_t *);
-#else
-#endif
int sys___futimes50(struct lwp *, const struct sys___futimes50_args *, register_t *);
int sys___lutimes50(struct lwp *, const struct sys___lutimes50_args *, register_t *);
