From e04dc482698d2ea6f153f000051abdd7a370515c Mon Sep 17 00:00:00 2001
From: pgoyette <pgoyette@NetBSD.org>
Date: Tue, 29 Dec 2015 10:22:05 +0000
Subject: [PATCH] Now that the table of auto-loadable syscalls is
 per-emulation, make sure that the rump-kernel has its own list.  Otherwise,
 missing syscalls won't trigger a module auto-load.

This commit finishes the work to get tests/lib/librumphijack/t_tcpip
nfs_autoload test case working again after 16 months of failures!  (see
PR bin/49153).
---
 sys/rump/librump/rumpkern/emul.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys/rump/librump/rumpkern/emul.c b/sys/rump/librump/rumpkern/emul.c
index bef3c712925c..b388fadcade1 100644
--- a/sys/rump/librump/rumpkern/emul.c
+++ b/sys/rump/librump/rumpkern/emul.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.173 2015/08/25 14:47:26 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.174 2015/12/29 10:22:05 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.173 2015/08/25 14:47:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.174 2015/12/29 10:22:05 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -133,6 +133,11 @@ struct loadavg averunnable = {
 	FSCALE,
 };
 
+/*
+ * Include the autogenerated list of auto-loadable syscalls
+ */
+#include <kern/syscalls_autoload.c>
+
 struct emul emul_netbsd = {
 	.e_name = "netbsd-rump",
 	.e_sysent = rump_sysent,
@@ -143,6 +148,7 @@ struct emul emul_netbsd = {
 #ifdef __HAVE_SYSCALL_INTERN
 	.e_syscall_intern = syscall_intern,
 #endif
+	.e_sc_autoload = netbsd_syscalls_autoload,
 };
 
 u_int nprocs = 1;