From ca46e90ef41e1ed70ff475e128b3ceb1ed490a57 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 28 Dec 2003 04:18:13 +0000
Subject: [PATCH] Fixed some disordering in revs.1.194 and 1,196.  Moved the
 exceve() syscall function back to near the beginning of the file.  Rev.1.194
 moved it into the middle of auxiliary functions following kern_execve(). 
 Moved the __mac_execve() syscall function up together with execve().  It was
 new in rev1.1.196 and perfectly misplaced after execve().

---
 sys/kern/kern_exec.c | 110 +++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index bceaca347bcc..3aa48efda920 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -134,6 +134,61 @@ sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS)
  */
 static const struct execsw **execsw;
 
+#ifndef _SYS_SYSPROTO_H_
+struct execve_args {
+        char    *fname; 
+        char    **argv;
+        char    **envv; 
+};
+#endif
+
+/*
+ * MPSAFE
+ */
+int
+execve(td, uap)
+	struct thread *td;
+	struct execve_args /* {
+		char *fname;
+		char **argv;
+		char **envv;
+	} */ *uap;
+{
+
+	return (kern_execve(td, uap->fname, uap->argv, uap->envv, NULL));
+}
+
+#ifndef _SYS_SYSPROTO_H_
+struct __mac_execve_args {
+	char	*fname;
+	char	**argv;
+	char	**envv;
+	struct mac	*mac_p;
+};
+#endif
+
+/*
+ * MPSAFE
+ */
+int
+__mac_execve(td, uap)
+	struct thread *td;
+	struct __mac_execve_args /* {
+		char *fname;
+		char **argv;
+		char **envv;
+		struct mac *mac_p;
+	} */ *uap;
+{
+
+#ifdef MAC
+	return (kern_execve(td, uap->fname, uap->argv, uap->envv,
+	    uap->mac_p));
+#else
+	return (ENOSYS);
+#endif
+}
+
 /*
  * In-kernel implementation of execve().  All arguments are assumed to be
  * userspace pointers from the passed thread.
@@ -669,61 +724,6 @@ kern_execve(td, fname, argv, envv, mac_p)
 	return (error);
 }
 
-#ifndef _SYS_SYSPROTO_H_
-struct execve_args {
-        char    *fname; 
-        char    **argv;
-        char    **envv; 
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-execve(td, uap)
-	struct thread *td;
-	struct execve_args /* {
-		char *fname;
-		char **argv;
-		char **envv;
-	} */ *uap;
-{
-
-	return (kern_execve(td, uap->fname, uap->argv, uap->envv, NULL));
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct __mac_execve_args {
-	char	*fname;
-	char	**argv;
-	char	**envv;
-	struct mac	*mac_p;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-__mac_execve(td, uap)
-	struct thread *td;
-	struct __mac_execve_args /* {
-		char *fname;
-		char **argv;
-		char **envv;
-		struct mac *mac_p;
-	} */ *uap;
-{
-
-#ifdef MAC
-	return (kern_execve(td, uap->fname, uap->argv, uap->envv,
-	    uap->mac_p));
-#else
-	return (ENOSYS);
-#endif
-}
-
 int
 exec_map_first_page(imgp)
 	struct image_params *imgp;