From 5b330c7b777c18a74e5f6af745a6ac10301517ed Mon Sep 17 00:00:00 2001
From: gwr <gwr@NetBSD.org>
Date: Wed, 23 Nov 1994 06:46:25 +0000
Subject: [PATCH] sun_* -> sunos_*

---
 sys/arch/sun3/sun3/machdep.c | 15 ++++++++-------
 sys/arch/sun3/sun3/trap.c    | 14 +++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 534e56e75396..68f13d9499b5 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.41 1994/11/23 05:43:00 gwr Exp $	*/
+/*	$NetBSD: machdep.c,v 1.42 1994/11/23 06:46:25 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -1195,7 +1195,7 @@ void boot(howto)
  * SunOS reboot system call (for compatibility).
  * Sun lets you pass in a boot string which the PROM
  * saves and provides to the next boot program.
- * XXX - Stuff this into sun_sysent at boot time?
+ * XXX - Stuff this into sunos_sysent at boot time?
  */
 static struct sun_howto_conv {
 	int sun_howto;
@@ -1254,9 +1254,9 @@ int sun_reboot(p, uap, retval)
  */
 static void hack_sun_reboot()
 {
-	extern struct sysent sun_sysent[];
-	sun_sysent[55].sy_narg = 2;
-	sun_sysent[55].sy_call = sun_reboot;
+	extern struct sysent sunos_sysent[];
+	sunos_sysent[55].sy_narg = 2;
+	sunos_sysent[55].sy_call = sun_reboot;
 }
 #endif	/* COMPAT_SUNOS */
 
@@ -1464,8 +1464,9 @@ cpu_exec_aout_makecmds(p, epp)
 	int error = ENOEXEC;
 
 #ifdef COMPAT_SUNOS
-	extern sun_exec_aout_makecmds __P((struct proc *, struct exec_package *));
-	if ((error = sun_exec_aout_makecmds(p, epp)) == 0)
+	extern sunos_exec_aout_makecmds
+		__P((struct proc *, struct exec_package *));
+	if ((error = sunos_exec_aout_makecmds(p, epp)) == 0)
 		return 0;
 #endif
 	return error;
diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c
index fd87a6b37ea7..21c4b5c9202c 100644
--- a/sys/arch/sun3/sun3/trap.c
+++ b/sys/arch/sun3/sun3/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.31 1994/11/21 21:39:14 gwr Exp $	*/
+/*	$NetBSD: trap.c,v 1.32 1994/11/23 06:46:30 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -67,9 +67,9 @@
 #include <machine/reg.h>
 
 #ifdef COMPAT_SUNOS
-#include <compat/sunos/sun_syscall.h>
-extern struct	sysent	sun_sysent[];
-extern int	nsun_sysent;
+#include <compat/sunos/sunos_syscall.h>
+extern struct	sysent	sunos_sysent[];
+extern int	nsunos_sysent;
 #endif
 
 
@@ -524,8 +524,8 @@ syscall(code, frame)
 	switch (p->p_emul) {
 #ifdef COMPAT_SUNOS
 	case EMUL_SUNOS:
-		systab = sun_sysent;
-		numsys = nsun_sysent;
+		systab = sunos_sysent;
+		numsys = nsunos_sysent;
 		/*
 		 * SunOS passes the syscall-number on the stack, whereas
 		 * BSD passes it in D0. So, we have to get the real "code"
@@ -540,7 +540,7 @@ syscall(code, frame)
 		 * XXX stored pc on the stack to skip, the argument follows
 		 * XXX the syscall number without a gap.
 		 */
-		if (code != SUN_SYS_sigreturn) {
+		if (code != SUNOS_SYS_sigreturn) {
 			frame.f_regs[SP] += sizeof (int);
 			/*
 			 * remember that we adjusted the SP, might have to