summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-18 00:15:11 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-18 00:15:11 +0000
commitd85ea9db28ae89d727e3ca0da27618bee3637a4c (patch)
tree7e13cf30e5fc1d339ec8edeea610eb562c2244b5 /sys
parentce8ecd5481db3e289ecc79d4db75e80c1e2d9ab2 (diff)
Kill emul left-over.
From Martin Natano
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/exec_conf.c4
-rw-r--r--sys/sys/proc.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index fe82f2f9018..3dd61f70c41 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_conf.c,v 1.32 2014/10/09 04:04:27 tedu Exp $ */
+/* $OpenBSD: exec_conf.c,v 1.33 2015/07/18 00:15:10 mpi Exp $ */
/* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */
/*
@@ -43,7 +43,7 @@
#include <compat/linux/linux_exec.h>
#endif
-extern struct emul emul_native, emul_elf32, emul_elf64, emul_linux_elf;
+extern struct emul emul_native, emul_linux_elf;
struct execsw execsw[] = {
{ EXEC_SCRIPT_HDRSZ, exec_script_makecmds, &emul_native, }, /* shell scripts */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 054c8e9c373..b388d13cb7c 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.199 2015/02/10 05:28:18 guenther Exp $ */
+/* $OpenBSD: proc.h,v 1.200 2015/07/18 00:15:10 mpi Exp $ */
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
/*-
@@ -117,9 +117,6 @@ struct emul {
#define EMUL_ENABLED 0x0001 /* Allow exec to continue */
#define EMUL_NATIVE 0x0002 /* Always enabled */
-extern struct emul *emulsw[]; /* All emuls in system */
-extern int nemuls; /* Number of emuls */
-
/*
* time usage: accumulated times in ticks
* One a second, each thread's immediate counts (p_[usi]ticks) are