From 8feb0ae52506269f94e1d4f95295b2bc2094e8d4 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Thu, 20 Nov 1997 20:07:59 +0000
Subject: [PATCH] Fixed a sloppy common-style definitions.

---
 sys/kern/kern_linker.c |  4 +++-
 sys/kern/link_aout.c   |  9 ++++++++-
 sys/sys/linker.h       | 10 ++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 9efaae20e577..ef83ab310af5 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_linker.c,v 1.2 1997/08/02 14:31:28 bde Exp $
+ *	$Id: kern_linker.c,v 1.3 1997/11/06 19:29:10 phk Exp $
  */
 
 #include <sys/param.h>
@@ -38,6 +38,8 @@
 #include <sys/module.h>
 #include <sys/linker.h>
 
+linker_file_t linker_current_file;
+
 static struct lock lock;	/* lock for the file list */
 static linker_class_list_t classes;
 static linker_file_list_t files;
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 4fbd5cd589ec..58c403bcc811 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_aout.c,v 1.3 1997/10/24 05:29:07 jmg Exp $
+ *	$Id: link_aout.c,v 1.4 1997/11/07 08:52:59 phk Exp $
  */
 
 #include <sys/param.h>
@@ -44,6 +44,13 @@ static int		link_aout_lookup_symbol(linker_file_t, const char*,
 						caddr_t*, size_t*);
 static void		link_aout_unload(linker_file_t);
 
+/*
+ * The file representing the currently running kernel.  This contains
+ * the global symbol table.
+ */
+
+static linker_file_t linker_kernel_file;
+
 static struct linker_class_ops link_aout_class_ops = {
     link_aout_load_file,
 };
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index d1862424e0f2..99a4b54fa46d 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: linker.h,v 1.1 1997/05/07 16:05:45 dfr Exp $
  */
 
 #ifndef _SYS_LINKER_H_
@@ -105,17 +105,11 @@ struct linker_class {
     struct linker_class_ops *ops;
 };
 
-/*
- * The file representing the currently running kernel.  This contains
- * the global symbol table.
- */
-linker_file_t	linker_kernel_file;
-
 /*
  * The file which is currently loading.  Used to register modules with
  * the files which contain them.
  */
-linker_file_t	linker_current_file;
+extern linker_file_t	linker_current_file;
 
 /*
  * Add a new file class to the linker.