Merge branch 'kernel-src' into appstack-src

Author: anttikantee

sys/rump/include/rump/Makefile

@@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.8 2015/09/15 14:57:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.10 2016/02/02 12:22:23 pooka Exp $
 
 .include <bsd.own.mk>
 
 INCSDIR=	/usr/include/rump
 
 .if (${MKRUMP} != "no")
 INCS=		rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
+INCS+=		rump_syscallshotgun.h
 INCS+=		rumpdefs.h rumperr.h rumperrno2host.h rumpuser.h rumpvnode_if.h
+INCS+=		rumpfs.h
 
 INCS+=		rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
 .endif

sys/rump/include/rump/rump.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.64 2015/11/01 12:34:28 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.68 2016/01/31 23:14:34 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -46,23 +46,11 @@ struct lwp;
 struct modinfo;
 struct uio;
 
-/* yetch */
-#if defined(__NetBSD__)
-#include <prop/proplib.h>
-#else
-#ifndef HAVE_PROP_DICTIONARY_T
-#define HAVE_PROP_DICTIONARY_T
-struct prop_dictionary;
-typedef struct prop_dictionary *prop_dictionary_t;
-#endif
-#endif /* __NetBSD__ */
-
 #if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T)
 #define RUMP_REGISTER_T long
 typedef RUMP_REGISTER_T register_t;
 #endif
 
-#include <rump/rumpvnode_if.h>
 #include <rump/rumpdefs.h>
 
 /* rumpkern */
@@ -144,80 +132,10 @@ _END_DECLS
 #endif
 
 /*
- * Begin rump syscall conditionals.  Yes, something a little better
- * is required here.
+ * Include macros prehistorically provided by this header.
+ * The inclusion might go away some year.  Include the header directly
+ * if you want it to keep working for you.
  */
-#ifdef RUMP_SYS_NETWORKING
-#define socket(a,b,c) rump_sys_socket(a,b,c)
-#define accept(a,b,c) rump_sys_accept(a,b,c)
-#define bind(a,b,c) rump_sys_bind(a,b,c)
-#define connect(a,b,c) rump_sys_connect(a,b,c)
-#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
-#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
-#define listen(a,b) rump_sys_listen(a,b)
-#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
-#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
-#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
-#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
-#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
-#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
-#define shutdown(a,b) rump_sys_shutdown(a,b)
-#endif /* RUMP_SYS_NETWORKING */
-
-#ifdef RUMP_SYS_IOCTL
-#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
-#define fcntl(...) rump_sys_fcntl(__VA_ARGS__)
-#endif /* RUMP_SYS_IOCTL */
-
-#ifdef RUMP_SYS_CLOSE
-#define close(a) rump_sys_close(a)
-#endif /* RUMP_SYS_CLOSE */
-
-#ifdef RUMP_SYS_OPEN
-#define open(...) rump_sys_open(__VA_ARGS__)
-#endif /* RUMP_SYS_OPEN */
-
-#ifdef RUMP_SYS_READWRITE
-#define read(a,b,c) rump_sys_read(a,b,c)
-#define readv(a,b,c) rump_sys_readv(a,b,c)
-#define pread(a,b,c,d) rump_sys_pread(a,b,c,d)
-#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
-#define write(a,b,c) rump_sys_write(a,b,c)
-#define writev(a,b,c) rump_sys_writev(a,b,c)
-#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
-#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
-#endif /* RUMP_SYS_READWRITE */
-
-#ifdef RUMP_SYS_FILEOPS
-#define mkdir(a,b) rump_sys_mkdir(a,b)
-#define rmdir(a) rump_sys_rmdir(a)
-#define link(a,b) rump_sys_link(a,b)
-#define symlink(a,b) rump_sys_symlink(a,b)
-#define unlink(a) rump_sys_unlink(a)
-#define readlink(a,b,c) rump_sys_readlink(a,b,c)
-#define chdir(a) rump_sys_chdir(a)
-#define fsync(a) rump_sys_fsync(a)
-#define sync() rump_sys_sync()
-#define chown(a,b,c) rump_sys_chown(a,b,c)
-#define fchown(a,b,c) rump_sys_fchown(a,b,c)
-#define lchown(a,b,c) rump_sys_lchown(a,b,c)
-#define lseek(a,b,c) rump_sys_lseek(a,b,c)
-#define mknod(a,b,c) rump_sys_mknod(a,b,c)
-#define rename(a,b) rump_sys_rename(a,b)
-#define truncate(a,b) rump_sys_truncate(a,b)
-#define ftruncate(a,b) rump_sys_ftruncate(a,b)
-#define umask(a) rump_sys_umask(a)
-#define getdents(a,b,c) rump_sys_getdents(a,b,c)
-#endif /* RUMP_SYS_FILEOPS */
-
-#ifdef RUMP_SYS_STAT
-#define stat(a,b) rump_sys_stat(a,b)
-#define fstat(a,b) rump_sys_fstat(a,b)
-#define lstat(a,b) rump_sys_lstat(a,b)
-#endif /* RUMP_SYS_STAT */
-
-#ifdef RUMP_SYS_PROCOPS
-#define getpid() rump_sys_getpid()
-#endif /* RUMP_SYS_PROCOPS */
+#include <rump/rump_syscallshotgun.h>
 
 #endif /* _RUMP_RUMP_H_ */