summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-11-20 20:07:59 +0000
committerbde <bde@FreeBSD.org>1997-11-20 20:07:59 +0000
commit8feb0ae52506269f94e1d4f95295b2bc2094e8d4 (patch)
treeda61693d271cbda5634e71638b840e3a2b21db07 /sys
parent390341dca56b4b438dec1f970c9357e73ab66837 (diff)
downloadFreeBSD-src-8feb0ae52506269f94e1d4f95295b2bc2094e8d4.zip
FreeBSD-src-8feb0ae52506269f94e1d4f95295b2bc2094e8d4.tar.gz
Fixed a sloppy common-style definitions.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_linker.c4
-rw-r--r--sys/kern/link_aout.c9
-rw-r--r--sys/sys/linker.h10
3 files changed, 13 insertions, 10 deletions
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 9efaae2..ef83ab3 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 4fbd5cd..58c403b 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 d186242..99a4b54 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_
@@ -106,16 +106,10 @@ struct linker_class {
};
/*
- * 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.
OpenPOWER on IntegriCloud