Tue Feb 18 06:20:46 2014 UTC ()
remove stub now provided by rump kernel base


(pooka)
diff -r1.10 -r1.11 src/sys/rump/kern/lib/libsys_linux/component.c
cvs diff -r1.10 -r1.11 src/sys/rump/kern/lib/libsys_linux/Attic/component.c (switch to unified diff)

--- src/sys/rump/kern/lib/libsys_linux/Attic/component.c 2013/12/17 14:30:18 1.10
+++ src/sys/rump/kern/lib/libsys_linux/Attic/component.c 2014/02/18 06:20:46 1.11
@@ -1,106 +1,105 @@ @@ -1,106 +1,105 @@
1/* $NetBSD: component.c,v 1.10 2013/12/17 14:30:18 pooka Exp $ */ 1/* $NetBSD: component.c,v 1.11 2014/02/18 06:20:46 pooka Exp $ */
2 2
3#include <sys/param.h> 3#include <sys/param.h>
4#include <sys/proc.h> 4#include <sys/proc.h>
5 5
6#include <compat/linux/common/linux_errno.h> 6#include <compat/linux/common/linux_errno.h>
7 7
8#include <uvm/uvm_extern.h> 8#include <uvm/uvm_extern.h>
9 9
10#include "rump_private.h" 10#include "rump_private.h"
11 11
12#include "rump_linux_syscall.h" 12#include "rump_linux_syscall.h"
13 13
14extern struct sysent rump_linux_sysent[]; 14extern struct sysent rump_linux_sysent[];
15 15
16#ifdef __HAVE_SYSCALL_INTERN 16#ifdef __HAVE_SYSCALL_INTERN
17static void 17static void
18rumplinux_syscall_intern(struct proc *p) 18rumplinux_syscall_intern(struct proc *p)
19{ 19{
20 20
21 p->p_emuldata = __UNCONST(native_to_linux_errno); 21 p->p_emuldata = __UNCONST(native_to_linux_errno);
22} 22}
23#endif 23#endif
24 24
25struct emul emul_rump_sys_linux = { 25struct emul emul_rump_sys_linux = {
26 .e_name = "linux-rump", 26 .e_name = "linux-rump",
27 .e_sysent = rump_linux_sysent, 27 .e_sysent = rump_linux_sysent,
28#ifndef __HAVE_MINIMAL_EMUL 28#ifndef __HAVE_MINIMAL_EMUL
29 .e_nsysent = RUMP_LINUX_SYS_NSYSENT, 29 .e_nsysent = RUMP_LINUX_SYS_NSYSENT,
30 .e_errno = native_to_linux_errno, 30 .e_errno = native_to_linux_errno,
31#endif 31#endif
32 .e_vm_default_addr = uvm_default_mapaddr, 32 .e_vm_default_addr = uvm_default_mapaddr,
33#ifdef __HAVE_SYSCALL_INTERN 33#ifdef __HAVE_SYSCALL_INTERN
34 .e_syscall_intern = rumplinux_syscall_intern, 34 .e_syscall_intern = rumplinux_syscall_intern,
35#endif 35#endif
36}; 36};
37 37
38RUMP_COMPONENT(RUMP_COMPONENT_KERN) 38RUMP_COMPONENT(RUMP_COMPONENT_KERN)
39{ 39{
40 extern struct emul *emul_default; 40 extern struct emul *emul_default;
41 41
42 emul_default = &emul_rump_sys_linux; 42 emul_default = &emul_rump_sys_linux;
43} 43}
44 44
45#include <compat/linux/common/linux_machdep.h> 45#include <compat/linux/common/linux_machdep.h>
46 46
47dev_t 47dev_t
48linux_fakedev(dev_t in, int raw) 48linux_fakedev(dev_t in, int raw)
49{ 49{
50 50
51 /* I don't really think it matters what we return here */ 51 /* I don't really think it matters what we return here */
52 return in; 52 return in;
53} 53}
54 54
55/* 55/*
56 * XXX: the linux emulation code is not split into factions 56 * XXX: the linux emulation code is not split into factions
57 */ 57 */
58void rumplinux__stub(void); 58void rumplinux__stub(void);
59void rumplinux__stub(void) {panic("unavailable");} 59void rumplinux__stub(void) {panic("unavailable");}
60 60
61/* timing */ 61/* timing */
62__weak_alias(clock_gettime1,rumplinux__stub); 62__weak_alias(clock_gettime1,rumplinux__stub);
63__weak_alias(clock_settime1,rumplinux__stub); 63__weak_alias(clock_settime1,rumplinux__stub);
64__weak_alias(clock_getres1,rumplinux__stub); 64__weak_alias(clock_getres1,rumplinux__stub);
65__weak_alias(compat_50_sys_gettimeofday,rumplinux__stub); 65__weak_alias(compat_50_sys_gettimeofday,rumplinux__stub);
66__weak_alias(compat_50_sys_settimeofday,rumplinux__stub); 66__weak_alias(compat_50_sys_settimeofday,rumplinux__stub);
67__weak_alias(nanosleep1,rumplinux__stub); 67__weak_alias(nanosleep1,rumplinux__stub);
68 68
69/* vm-related */ 69/* vm-related */
70__weak_alias(sys_mmap,rumplinux__stub); 70__weak_alias(sys_mmap,rumplinux__stub);
71__weak_alias(vm_map_unlock,rumplinux__stub); 71__weak_alias(vm_map_unlock,rumplinux__stub);
72__weak_alias(uvm_map_lookup_entry,rumplinux__stub); 72__weak_alias(uvm_map_lookup_entry,rumplinux__stub);
73__weak_alias(sys_obreak,rumplinux__stub); 73__weak_alias(sys_obreak,rumplinux__stub);
74__weak_alias(sys_swapctl,rumplinux__stub); 
75__weak_alias(vm_map_lock,rumplinux__stub); 74__weak_alias(vm_map_lock,rumplinux__stub);
76__weak_alias(uvm_mremap,rumplinux__stub); 75__weak_alias(uvm_mremap,rumplinux__stub);
77 76
78/* signal.c */ 77/* signal.c */
79__weak_alias(sigaction1,rumplinux__stub); 78__weak_alias(sigaction1,rumplinux__stub);
80__weak_alias(kpsignal2,rumplinux__stub); 79__weak_alias(kpsignal2,rumplinux__stub);
81__weak_alias(sys_kill,rumplinux__stub); 80__weak_alias(sys_kill,rumplinux__stub);
82__weak_alias(sigsuspend1,rumplinux__stub); 81__weak_alias(sigsuspend1,rumplinux__stub);
83__weak_alias(sigtimedwait1,rumplinux__stub); 82__weak_alias(sigtimedwait1,rumplinux__stub);
84__weak_alias(lwp_find,rumplinux__stub); 83__weak_alias(lwp_find,rumplinux__stub);
85 84
86/* misc */ 85/* misc */
87__weak_alias(linux_machdepioctl,rumplinux__stub); 86__weak_alias(linux_machdepioctl,rumplinux__stub);
88__weak_alias(linux_ioctl_sg,rumplinux__stub); 87__weak_alias(linux_ioctl_sg,rumplinux__stub);
89__weak_alias(oss_ioctl_mixer,rumplinux__stub); 88__weak_alias(oss_ioctl_mixer,rumplinux__stub);
90__weak_alias(oss_ioctl_sequencer,rumplinux__stub); 89__weak_alias(oss_ioctl_sequencer,rumplinux__stub);
91__weak_alias(oss_ioctl_audio,rumplinux__stub); 90__weak_alias(oss_ioctl_audio,rumplinux__stub);
92__weak_alias(rusage_to_rusage50,rumplinux__stub); 91__weak_alias(rusage_to_rusage50,rumplinux__stub);
93__weak_alias(do_sys_wait,rumplinux__stub); 92__weak_alias(do_sys_wait,rumplinux__stub);
94 93
95/* arch-specific */ 94/* arch-specific */
96__weak_alias(compat_offseterr,rumplinux__stub); 95__weak_alias(compat_offseterr,rumplinux__stub);
97__weak_alias(linux_sys_ptrace_arch,rumplinux__stub); 96__weak_alias(linux_sys_ptrace_arch,rumplinux__stub);
98 97
99#ifdef __i386__ 98#ifdef __i386__
100const char * 99const char *
101linux_get_uname_arch(void) 100linux_get_uname_arch(void)
102{ 101{
103 102
104 return MACHINE_ARCH; 103 return MACHINE_ARCH;
105} 104}
106#endif /* __i386__ */ 105#endif /* __i386__ */