Move some stuff into headers where they belong.

Sponsored by:	Google SoC 2006
Submitted by:	rdivacky
Noticed by:	jhb, ssouhlal

6 files changed, 4 insertions, 16 deletions

diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index cbcf320..4fa6f14 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -125,8 +125,6 @@ static void	linux32_fixlimits(struct proc *p);
 
 extern LIST_HEAD(futex_list, futex) futex_list;
 extern struct mtx futex_mtx;
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
 
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h
index 1cae3db..0c43175 100644
--- a/sys/compat/linux/linux_emul.h
+++ b/sys/compat/linux/linux_emul.h
@@ -72,4 +72,7 @@ void linux_proc_exit(void *, struct proc *);
 void linux_schedtail(void *, struct proc *);
 void linux_proc_exec(void *, struct proc *, struct image_params *);
 
+extern struct sx emul_shared_lock;
+extern struct sx emul_lock;
+
 #endif /* !_LINUX_EMUL_H_ */
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index b209f78..068c6e9 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -94,9 +94,6 @@ __FBSDID("$FreeBSD$");
 #define BSD_TO_LINUX_SIGNAL(sig)	\
 	(((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig)
 
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
-
 static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = {
 	RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK,
 	RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE,
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 50a05fa..a33acc7 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -51,9 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <compat/linux/linux_util.h>
 #include <compat/linux/linux_emul.h>
 
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
-
 void
 linux_to_bsd_sigset(l_sigset_t *lss, sigset_t *bss)
 {
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index d49f425..a1dc8f7 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -67,9 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_posix.h"
 
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
-
 extern struct sysentvec elf32_freebsd_sysvec;	/* defined in i386/i386/elf_machdep.c */
 
 struct l_descriptor {
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index e3e65e9..b6b2cda 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
+#include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_signal.h>
 #include <compat/linux/linux_util.h>
@@ -106,12 +107,7 @@ static void     linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask);
 static void	exec_linux_setregs(struct thread *td, u_long entry,
 				   u_long stack, u_long ps_strings);
 
-extern void linux_proc_exit(void *, struct proc *, struct image_params *);
-extern void linux_proc_exec(void *, struct proc *, struct image_params *);
-extern void linux_schedtail(void *, struct proc *);
 extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
 extern struct mtx futex_mtx;
 
 static eventhandler_tag linux_exit_tag;