native emul is now called "native"

6 files changed, 16 insertions, 16 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index c15255c21a0..a5bcdea8398 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1471,7 +1471,7 @@ cpu_exec_ecoff_hook(p, epp, eap)
 	struct ecoff_aouthdr *eap;
 {
 	struct ecoff_filehdr *efp = epp->ep_hdr;
-	extern struct emul emul_netbsd;
+	extern struct emul emul_native;
 #ifdef COMPAT_OSF1
 	extern struct emul emul_osf1;
 #endif
@@ -1483,8 +1483,8 @@ cpu_exec_ecoff_hook(p, epp, eap)
 		break;
 #endif
 
-	case ECOFF_MAGIC_NETBSD_ALPHA:
-		epp->ep_emul = &emul_netbsd;
+	case ECOFF_MAGIC_NATIVE_ALPHA:
+		epp->ep_emul = &emul_native;
 		break;
 
 	default:
diff --git a/sys/arch/alpha/include/ecoff.h b/sys/arch/alpha/include/ecoff.h
index b8fff03678f..08427556592 100644
--- a/sys/arch/alpha/include/ecoff.h
+++ b/sys/arch/alpha/include/ecoff.h
@@ -42,10 +42,10 @@
         u_long ea_gp_value
 
 #define ECOFF_MAGIC_ALPHA		0603
-#define ECOFF_MAGIC_NETBSD_ALPHA	0605
+#define ECOFF_MAGIC_NATIVE_ALPHA	0605
 #define ECOFF_BADMAG(ex)					\
 	(ex->ef_magic != ECOFF_MAGIC_ALPHA &&			\
-	    ex->ef_magic != ECOFF_MAGIC_NETBSD_ALPHA)
+	    ex->ef_magic != ECOFF_MAGIC_NATIVE_ALPHA)
 
 #define ECOFF_SEGMENT_ALIGNMENT(eap) (eap->ea_vstamp < 23 ? 8 : 16)
 
diff --git a/sys/arch/hp300/dev/hil.c b/sys/arch/hp300/dev/hil.c
index 3b41473254b..bf93d1eec0a 100644
--- a/sys/arch/hp300/dev/hil.c
+++ b/sys/arch/hp300/dev/hil.c
@@ -246,7 +246,7 @@ hilclose(dev, flags, mode, p)
 	u_char device = HILUNIT(dev);
 	char mask, lpctrl;
 	int s;
-	extern struct emul emul_netbsd;
+	extern struct emul emul_native;
 
 #ifdef DEBUG
 	if (hildebug & HDB_FOLLOW)
@@ -257,7 +257,7 @@ hilclose(dev, flags, mode, p)
 	if (device && (dptr->hd_flags & HIL_PSEUDO))
 		return (0);
 
-	if (p && p->p_emul == &emul_netbsd) {
+	if (p && p->p_emul == &emul_native) {
 		/*
 		 * If this is the loop device,
 		 * free up all queues belonging to this process.
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index a76698e3ffb..797422e29da 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.8 1996/05/07 15:23:35 niklas Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.9 1996/05/27 07:59:02 deraadt Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84 1996/04/22 01:38:12 christos Exp $	*/
 
 /*
@@ -124,8 +124,8 @@ extern char sigcode[], esigcode[];
 extern char *syscallnames[];
 #endif
 
-struct emul emul_netbsd = {
-	"netbsd",
+struct emul emul_native = {
+	"native",
 	NULL,
 	sendsig,
 	SYS_syscall,
@@ -206,7 +206,7 @@ main(framep)
 	p->p_flag = P_INMEM | P_SYSTEM;
 	p->p_stat = SRUN;
 	p->p_nice = NZERO;
-	p->p_emul = &emul_netbsd;
+	p->p_emul = &emul_native;
 	bcopy("swapper", p->p_comm, sizeof ("swapper"));
 
 	/* Create credentials. */
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 26db4b37d20..ad2541c0ae6 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.3 1996/03/03 17:19:43 niklas Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.4 1996/05/27 07:59:03 deraadt Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -229,7 +229,7 @@ sys_execve(p, v, retval)
 	struct vmspace *vm = p->p_vmspace;
 	char **tmpfap;
 	int szsigcode;
-	extern struct emul emul_netbsd;
+	extern struct emul emul_native;
 
 	/*
 	 * figure out the maximum size of an exec header, if necessary.
@@ -258,7 +258,7 @@ sys_execve(p, v, retval)
 	pack.ep_vmcmds.evs_cnt = 0;
 	pack.ep_vmcmds.evs_used = 0;
 	pack.ep_vap = &attr;
-	pack.ep_emul = &emul_netbsd;
+	pack.ep_emul = &emul_native;
 	pack.ep_flags = 0;
 
 	/* see if we can run it. */
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index f119f7f0f52..9aa862cec26 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -100,7 +100,7 @@ struct emulation {
 };
 
 static struct emulation emulations[] = {
-	{ "netbsd",	     syscallnames,        SYS_MAXSYSCALL },
+	{ "native",	     syscallnames,        SYS_MAXSYSCALL },
 	{ "hpux",	hpux_syscallnames,   HPUX_SYS_MAXSYSCALL },
 	{ "ibcs2",     ibcs2_syscallnames,  IBCS2_SYS_MAXSYSCALL },
 	{ "linux",     linux_syscallnames,  LINUX_SYS_MAXSYSCALL },
@@ -129,7 +129,7 @@ main(argc, argv)
 	register void *m;
 	int trpoints = ALL_POINTS;
 
-	current = &emulations[0];	/* NetBSD */
+	current = &emulations[0];	/* native */
 
 	while ((ch = getopt(argc, argv, "e:f:dlm:nRTt:")) != -1)
 		switch (ch) {