summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Pankov <yuripv@FreeBSD.org>2019-10-18 10:28:08 +0000
committerYuri Pankov <yuripv@FreeBSD.org>2019-10-18 10:28:08 +0000
commitb9d3556a34b177d6488a69b31cea5a17c2f69b4e (patch)
tree0eae8a5aaf846ff4c1e272276e0bf5fd4ad2a953
parent9febfb790456f8c243fa9b1ee49f2ac7578ecc45 (diff)
Notes
-rw-r--r--sys/compat/linux/linux.c2
-rw-r--r--sys/compat/linux/linux.h2
-rw-r--r--sys/compat/linux/linux_futex.c2
-rw-r--r--sys/compat/linux/linux_futex.h1
4 files changed, 4 insertions, 3 deletions
diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c
index 0c725ad5dc9c..f88ca47cef42 100644
--- a/sys/compat/linux/linux.c
+++ b/sys/compat/linux/linux.c
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_common.h>
#include <compat/linux/linux_util.h>
+struct futex_list futex_list;
+
CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
static int bsd_to_linux_sigtbl[LINUX_SIGTBLSZ] = {
diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h
index d63bf376ff00..2be398ba5b05 100644
--- a/sys/compat/linux/linux.h
+++ b/sys/compat/linux/linux.h
@@ -140,4 +140,6 @@ void bsd_to_linux_sigset(sigset_t *, l_sigset_t *);
int linux_to_bsd_signal(int sig);
int bsd_to_linux_signal(int sig);
+extern LIST_HEAD(futex_list, futex) futex_list;
+
#endif /* _LINUX_MI_H_ */
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 7c15af2d89c2..831e990cc7eb 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -207,8 +207,6 @@ struct futex {
TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
};
-struct futex_list futex_list;
-
#define FUTEX_LOCK(f) mtx_lock(&(f)->f_lck)
#define FUTEX_LOCKED(f) mtx_owned(&(f)->f_lck)
#define FUTEX_UNLOCK(f) mtx_unlock(&(f)->f_lck)
diff --git a/sys/compat/linux/linux_futex.h b/sys/compat/linux/linux_futex.h
index 4171dd70504a..6dd1075bd368 100644
--- a/sys/compat/linux/linux_futex.h
+++ b/sys/compat/linux/linux_futex.h
@@ -38,7 +38,6 @@
#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