[src/trunk]: src/sys/rump/kern/lib/libsys_linux rename component.c -> sys_lin...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7812de668ee3
branches:  trunk
changeset: 327644:7812de668ee3
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 13 02:03:47 2014 +0000

description:
rename component.c -> sys_linux_component.c

diffstat:

 sys/rump/kern/lib/libsys_linux/Makefile              |    5 +-
 sys/rump/kern/lib/libsys_linux/component.c           |  105 -------------------
 sys/rump/kern/lib/libsys_linux/sys_linux_component.c |  105 +++++++++++++++++++
 3 files changed, 108 insertions(+), 107 deletions(-)

diffs (237 lines):

diff -r 56366cd3b4c3 -r 7812de668ee3 sys/rump/kern/lib/libsys_linux/Makefile
--- a/sys/rump/kern/lib/libsys_linux/Makefile   Thu Mar 13 02:03:16 2014 +0000
+++ b/sys/rump/kern/lib/libsys_linux/Makefile   Thu Mar 13 02:03:47 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/01/28 10:54:45 njoly Exp $
+#      $NetBSD: Makefile,v 1.6 2014/03/13 02:03:47 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../compat/linux/common
@@ -11,7 +11,8 @@
        linux_sysctl.c linux_termios.c linux_time.c linux_file64.c      \
        linux_pipe.c
 
-SRCS+= rump_linux_sysent.c component.c linux_rump.c
+SRCS+= rump_linux_sysent.c linux_rump.c
+SRCS+= sys_linux_component.c
 
 # XXX
 CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
diff -r 56366cd3b4c3 -r 7812de668ee3 sys/rump/kern/lib/libsys_linux/component.c
--- a/sys/rump/kern/lib/libsys_linux/component.c        Thu Mar 13 02:03:16 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*     $NetBSD: component.c,v 1.11 2014/02/18 06:20:46 pooka Exp $     */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-
-#include <compat/linux/common/linux_errno.h>
-
-#include <uvm/uvm_extern.h>
-
-#include "rump_private.h"
-
-#include "rump_linux_syscall.h"
-
-extern struct sysent rump_linux_sysent[];
-
-#ifdef __HAVE_SYSCALL_INTERN
-static void
-rumplinux_syscall_intern(struct proc *p)
-{
-
-       p->p_emuldata = __UNCONST(native_to_linux_errno);
-}
-#endif
-
-struct emul emul_rump_sys_linux = {
-       .e_name = "linux-rump",
-       .e_sysent = rump_linux_sysent,
-#ifndef __HAVE_MINIMAL_EMUL
-       .e_nsysent = RUMP_LINUX_SYS_NSYSENT,
-       .e_errno = native_to_linux_errno,
-#endif
-       .e_vm_default_addr = uvm_default_mapaddr,
-#ifdef __HAVE_SYSCALL_INTERN
-       .e_syscall_intern = rumplinux_syscall_intern,
-#endif
-};
-
-RUMP_COMPONENT(RUMP_COMPONENT_KERN)
-{
-       extern struct emul *emul_default;
-
-       emul_default = &emul_rump_sys_linux;
-}
-
-#include <compat/linux/common/linux_machdep.h>
-
-dev_t
-linux_fakedev(dev_t in, int raw)
-{
-
-       /* I don't really think it matters what we return here */
-       return in;
-}
-
-/*
- * XXX: the linux emulation code is not split into factions
- */
-void rumplinux__stub(void);
-void rumplinux__stub(void) {panic("unavailable");}
-
-/* timing */
-__weak_alias(clock_gettime1,rumplinux__stub);
-__weak_alias(clock_settime1,rumplinux__stub);
-__weak_alias(clock_getres1,rumplinux__stub);
-__weak_alias(compat_50_sys_gettimeofday,rumplinux__stub);
-__weak_alias(compat_50_sys_settimeofday,rumplinux__stub);
-__weak_alias(nanosleep1,rumplinux__stub);
-
-/* vm-related */
-__weak_alias(sys_mmap,rumplinux__stub);
-__weak_alias(vm_map_unlock,rumplinux__stub);
-__weak_alias(uvm_map_lookup_entry,rumplinux__stub);
-__weak_alias(sys_obreak,rumplinux__stub);
-__weak_alias(vm_map_lock,rumplinux__stub);
-__weak_alias(uvm_mremap,rumplinux__stub);
-
-/* signal.c */
-__weak_alias(sigaction1,rumplinux__stub);
-__weak_alias(kpsignal2,rumplinux__stub);
-__weak_alias(sys_kill,rumplinux__stub);
-__weak_alias(sigsuspend1,rumplinux__stub);
-__weak_alias(sigtimedwait1,rumplinux__stub);
-__weak_alias(lwp_find,rumplinux__stub);
-
-/* misc */
-__weak_alias(linux_machdepioctl,rumplinux__stub);
-__weak_alias(linux_ioctl_sg,rumplinux__stub);
-__weak_alias(oss_ioctl_mixer,rumplinux__stub);
-__weak_alias(oss_ioctl_sequencer,rumplinux__stub);
-__weak_alias(oss_ioctl_audio,rumplinux__stub);
-__weak_alias(rusage_to_rusage50,rumplinux__stub);
-__weak_alias(do_sys_wait,rumplinux__stub);
-
-/* arch-specific */
-__weak_alias(compat_offseterr,rumplinux__stub);
-__weak_alias(linux_sys_ptrace_arch,rumplinux__stub);
-
-#ifdef __i386__
-const char *
-linux_get_uname_arch(void)
-{
-
-       return MACHINE_ARCH;
-}
-#endif /* __i386__ */
diff -r 56366cd3b4c3 -r 7812de668ee3 sys/rump/kern/lib/libsys_linux/sys_linux_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/kern/lib/libsys_linux/sys_linux_component.c      Thu Mar 13 02:03:47 2014 +0000
@@ -0,0 +1,105 @@
+/*     $NetBSD: sys_linux_component.c,v 1.1 2014/03/13 02:03:47 pooka Exp $    */
+
+#include <sys/param.h>
+#include <sys/proc.h>
+
+#include <compat/linux/common/linux_errno.h>
+
+#include <uvm/uvm_extern.h>
+
+#include "rump_private.h"
+
+#include "rump_linux_syscall.h"
+
+extern struct sysent rump_linux_sysent[];
+
+#ifdef __HAVE_SYSCALL_INTERN
+static void
+rumplinux_syscall_intern(struct proc *p)
+{
+
+       p->p_emuldata = __UNCONST(native_to_linux_errno);
+}
+#endif
+
+struct emul emul_rump_sys_linux = {
+       .e_name = "linux-rump",
+       .e_sysent = rump_linux_sysent,
+#ifndef __HAVE_MINIMAL_EMUL
+       .e_nsysent = RUMP_LINUX_SYS_NSYSENT,
+       .e_errno = native_to_linux_errno,
+#endif
+       .e_vm_default_addr = uvm_default_mapaddr,
+#ifdef __HAVE_SYSCALL_INTERN
+       .e_syscall_intern = rumplinux_syscall_intern,
+#endif
+};
+
+RUMP_COMPONENT(RUMP_COMPONENT_KERN)
+{
+       extern struct emul *emul_default;
+
+       emul_default = &emul_rump_sys_linux;
+}
+
+#include <compat/linux/common/linux_machdep.h>
+
+dev_t
+linux_fakedev(dev_t in, int raw)
+{
+
+       /* I don't really think it matters what we return here */
+       return in;
+}
+
+/*
+ * XXX: the linux emulation code is not split into factions
+ */
+void rumplinux__stub(void);
+void rumplinux__stub(void) {panic("unavailable");}
+
+/* timing */
+__weak_alias(clock_gettime1,rumplinux__stub);
+__weak_alias(clock_settime1,rumplinux__stub);
+__weak_alias(clock_getres1,rumplinux__stub);
+__weak_alias(compat_50_sys_gettimeofday,rumplinux__stub);
+__weak_alias(compat_50_sys_settimeofday,rumplinux__stub);
+__weak_alias(nanosleep1,rumplinux__stub);
+
+/* vm-related */
+__weak_alias(sys_mmap,rumplinux__stub);
+__weak_alias(vm_map_unlock,rumplinux__stub);
+__weak_alias(uvm_map_lookup_entry,rumplinux__stub);
+__weak_alias(sys_obreak,rumplinux__stub);
+__weak_alias(vm_map_lock,rumplinux__stub);
+__weak_alias(uvm_mremap,rumplinux__stub);
+
+/* signal.c */
+__weak_alias(sigaction1,rumplinux__stub);
+__weak_alias(kpsignal2,rumplinux__stub);
+__weak_alias(sys_kill,rumplinux__stub);
+__weak_alias(sigsuspend1,rumplinux__stub);
+__weak_alias(sigtimedwait1,rumplinux__stub);
+__weak_alias(lwp_find,rumplinux__stub);
+
+/* misc */
+__weak_alias(linux_machdepioctl,rumplinux__stub);
+__weak_alias(linux_ioctl_sg,rumplinux__stub);
+__weak_alias(oss_ioctl_mixer,rumplinux__stub);
+__weak_alias(oss_ioctl_sequencer,rumplinux__stub);
+__weak_alias(oss_ioctl_audio,rumplinux__stub);
+__weak_alias(rusage_to_rusage50,rumplinux__stub);
+__weak_alias(do_sys_wait,rumplinux__stub);
+
+/* arch-specific */
+__weak_alias(compat_offseterr,rumplinux__stub);
+__weak_alias(linux_sys_ptrace_arch,rumplinux__stub);
+
+#ifdef __i386__
+const char *
+linux_get_uname_arch(void)
+{
+
+       return MACHINE_ARCH;
+}
+#endif /* __i386__ */