Author: dchagin
Date: Mon Jun 1 04:44:43 2009
New Revision: 193196
URL: http://svn.freebsd.org/changeset/base/193196
Log:
MFC r191741:
Move extern variable definitions to the header file.
Approved by: kib (mentor)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/amd64/linux32/linux32_sysvec.c
stable/7/sys/compat/linux/linux_futex.c
stable/7/sys/compat/linux/linux_futex.h
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/i386/linux/linux_sysvec.c
Modified: stable/7/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_sysvec.c Mon Jun 1 02:37:06 2009
(r193195)
+++ stable/7/sys/amd64/linux32/linux32_sysvec.c Mon Jun 1 04:44:43 2009
(r193196)
@@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$");
#include <amd64/linux32/linux.h>
#include <amd64/linux32/linux32_proto.h>
+#include <compat/linux/linux_futex.h>
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_misc.h>
@@ -126,9 +127,6 @@ static void exec_linux_setregs(struct th
u_long stack, u_long ps_strings);
static void linux32_fixlimit(struct rlimit *rl, int which);
-extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct mtx futex_mtx;
-
static eventhandler_tag linux_exit_tag;
static eventhandler_tag linux_schedtail_tag;
static eventhandler_tag linux_exec_tag;
Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c Mon Jun 1 02:37:06 2009
(r193195)
+++ stable/7/sys/compat/linux/linux_futex.c Mon Jun 1 04:44:43 2009
(r193196)
@@ -81,7 +81,7 @@ struct futex {
TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
};
-LIST_HEAD(futex_list, futex) futex_list;
+struct futex_list futex_list;
#define FUTEX_LOCK(f) sx_xlock(&(f)->f_lck)
#define FUTEX_UNLOCK(f) sx_xunlock(&(f)->f_lck)
Modified: stable/7/sys/compat/linux/linux_futex.h
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.h Mon Jun 1 02:37:06 2009
(r193195)
+++ stable/7/sys/compat/linux/linux_futex.h Mon Jun 1 04:44:43 2009
(r193196)
@@ -36,6 +36,9 @@
#ifndef _LINUX_FUTEX_H
#define _LINUX_FUTEX_H
+extern LIST_HEAD(futex_list, futex) futex_list;
+extern struct mtx futex_mtx;
+
#define LINUX_FUTEX_WAIT 0
#define LINUX_FUTEX_WAKE 1
#define LINUX_FUTEX_FD 2 /* unused */
Modified: stable/7/sys/i386/linux/linux_sysvec.c
==============================================================================
--- stable/7/sys/i386/linux/linux_sysvec.c Mon Jun 1 02:37:06 2009
(r193195)
+++ stable/7/sys/i386/linux/linux_sysvec.c Mon Jun 1 04:44:43 2009
(r193196)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
#include <i386/linux/linux.h>
#include <i386/linux/linux_proto.h>
+#include <compat/linux/linux_futex.h>
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_misc.h>
@@ -110,9 +111,6 @@ static register_t *linux_copyout_strings
static int linux_szplatform;
const char *linux_platform;
-extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct mtx futex_mtx;
-
static eventhandler_tag linux_exit_tag;
static eventhandler_tag linux_schedtail_tag;
static eventhandler_tag linux_exec_tag;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
