Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/kern/lib/libsys_linux If linux syscall emulation is...



details:   https://anonhg.NetBSD.org/src/rev/620852c5e8ce
branches:  trunk
changeset: 785299:620852c5e8ce
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 07 18:53:39 2013 +0000

description:
If linux syscall emulation is linked in to a rump kernel, use it as the
default emulation.

diffstat:

 sys/rump/kern/lib/libsys_linux/Makefile    |   4 ++--
 sys/rump/kern/lib/libsys_linux/component.c |  11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r d86ce89333c7 -r 620852c5e8ce sys/rump/kern/lib/libsys_linux/Makefile
--- a/sys/rump/kern/lib/libsys_linux/Makefile   Thu Mar 07 18:51:02 2013 +0000
+++ b/sys/rump/kern/lib/libsys_linux/Makefile   Thu Mar 07 18:53:39 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2012/09/19 21:45:40 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2013/03/07 18:53:39 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../compat/linux/common
@@ -13,7 +13,7 @@
 SRCS+= rump_linux_sysent.c component.c
 
 # XXX
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r d86ce89333c7 -r 620852c5e8ce sys/rump/kern/lib/libsys_linux/component.c
--- a/sys/rump/kern/lib/libsys_linux/component.c        Thu Mar 07 18:51:02 2013 +0000
+++ b/sys/rump/kern/lib/libsys_linux/component.c        Thu Mar 07 18:53:39 2013 +0000
@@ -1,10 +1,12 @@
-/*     $NetBSD: component.c,v 1.3 2012/11/17 16:38:22 pooka Exp $      */
+/*     $NetBSD: component.c,v 1.4 2013/03/07 18:53:40 pooka Exp $      */
 
 #include <sys/param.h>
 #include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 
+#include "rump_private.h"
+
 extern struct sysent rump_linux_sysent[];
 
 struct emul emul_rump_sys_linux = {
@@ -16,6 +18,13 @@
 #endif
 };
 
+RUMP_COMPONENT(RUMP_COMPONENT_KERN)
+{
+       extern struct emul *emul_default;
+
+       emul_default = &emul_rump_sys_linux;
+}
+
 /*
  * XXX: the linux emulation code is not split into factions
  */



Home | Main Index | Thread Index | Old Index