From e6de850e0541afec795082daf12bf197bd4fca79 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 16:01:57 +0000 Subject: MFC r283447: Fix build with KTR option. --- sys/compat/linux/linux_util.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sys/compat/linux/linux_util.h') diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 6be0392..3b00b6b 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -115,7 +115,6 @@ void linux_free_get_char_devices(char *string); #define LINUX_CTRFMT(nm, fmt) #nm"("fmt")" #define LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) do { \ - if (ldebug(f)) \ CTR6(KTR_LINUX, LINUX_CTRFMT(f, m), \ p1, p2, p3, p4, p5, p6); \ } while (0) -- cgit v1.1 From d30e84112a87337209ea45237f3d9b12e29abaa9 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 16:08:22 +0000 Subject: MFC r283421: Introduce a new module linux_common.ko which is intended for the following primary purposes: 1. Remove the dependency of linsysfs and linprocfs modules from linux.ko, which will be architecture specific on amd64. 2. Incorporate into linux_common.ko general code for platforms on which we'll support two Linuxulator modules (for both instruction set - 32 & 64 bit). 3. Move malloc(9) declaration to linux_common.ko, to enable getting memory usage statistics properly. Currently linux_common.ko incorporates a code from linux_mib.c and linux_util.c and linprocfs, linsysfs and linux kernel modules depend on linux_common.ko. Temporarily remove dtrace garbage from linux_mib.c and linux_util.c --- sys/compat/linux/linux_util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/compat/linux/linux_util.h') diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 3b00b6b..92fc2eb 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -44,6 +44,8 @@ #include #include +MALLOC_DECLARE(M_LINUX); + extern const char linux_emul_path[]; int linux_emul_convpath(struct thread *, const char *, enum uio_seg, char **, int, int); -- cgit v1.1 From 9bb36bc01cd74565fb879d43a4431edff14a2741 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 16:20:29 +0000 Subject: MFC r283427: Where possible we will use M_LINUX malloc(9) type. Move M_FUTEX defines to the linux_common.ko. --- sys/compat/linux/linux_util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/compat/linux/linux_util.h') diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 92fc2eb..0683099 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -45,6 +45,8 @@ #include MALLOC_DECLARE(M_LINUX); +MALLOC_DECLARE(M_FUTEX); +MALLOC_DECLARE(M_FUTEX_WP); extern const char linux_emul_path[]; -- cgit v1.1 From ea9daca70876b5680d1155aed1015cb3d9ec7e30 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 16:44:17 +0000 Subject: MFC r283441: Implement epoll family system calls. This is a tiny wrapper around kqueue() to implement epoll subset of functionality. The kqueue user data are 32bit on i386 which is not enough for epoll user data, so we keep user data in the proc emuldata. Initial patch developed by rdivacky@ in 2007, then extended by Yuri Victorovich @ r255672 and finished by me in collaboration with mjg@ and jillies@. --- sys/compat/linux/linux_util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/compat/linux/linux_util.h') diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 0683099..a52a7b9 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -45,6 +45,7 @@ #include MALLOC_DECLARE(M_LINUX); +MALLOC_DECLARE(M_EPOLL); MALLOC_DECLARE(M_FUTEX); MALLOC_DECLARE(M_FUTEX_WP); -- cgit v1.1