git: d41e592190fd - stable/13 - linux(4): Rename linux_timer.h to linux_time.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Mar 2023 08:43:17 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=d41e592190fdd7ae643b0abbf28e3607c1ac25ab
commit d41e592190fdd7ae643b0abbf28e3607c1ac25ab
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-02-14 14:46:33 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-03-01 08:42:35 +0000
linux(4): Rename linux_timer.h to linux_time.h
To avoid confusing people, rename linux_timer.h to linux_time.h,
as linux_timer.c is the implementation of timer syscalls only,
while linux_time.c contains implementation of all stuff declared
in linux_time.h.
MFC after: 2 weeks
(cherry picked from commit c8a79231a5a74fc4263ec3d18c6519a974efb529)
---
lib/libsysdecode/linux.c | 2 +-
lib/libsysdecode/mklinuxtables | 6 +++---
sys/amd64/linux/linux_vdso_gtod.c | 2 +-
sys/amd64/linux32/linux32_vdso_gtod.c | 2 +-
sys/arm64/linux/linux_vdso_gtod.c | 2 +-
sys/compat/linux/linux_event.c | 2 +-
sys/compat/linux/linux_futex.c | 2 +-
sys/compat/linux/linux_ioctl.c | 2 +-
sys/compat/linux/linux_ipc.c | 2 +-
sys/compat/linux/linux_misc.c | 2 +-
sys/compat/linux/linux_signal.c | 2 +-
sys/compat/linux/linux_socket.c | 2 +-
sys/compat/linux/linux_time.c | 2 +-
sys/compat/linux/{linux_timer.h => linux_time.h} | 6 +++---
sys/compat/linux/linux_timer.c | 2 +-
sys/i386/linux/linux_vdso_gtod.c | 2 +-
16 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c
index 76065ddf404e..4b6aab478a33 100644
--- a/lib/libsysdecode/linux.c
+++ b/lib/libsysdecode/linux.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux.h>
#include <compat/linux/linux_file.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#define X(a,b) { a, #b },
#define XEND { 0, NULL }
diff --git a/lib/libsysdecode/mklinuxtables b/lib/libsysdecode/mklinuxtables
index bcd6ddb5f618..eebdadd03613 100644
--- a/lib/libsysdecode/mklinuxtables
+++ b/lib/libsysdecode/mklinuxtables
@@ -89,9 +89,9 @@ cat <<_EOF_
_EOF_
gen_table "atflags" "LINUX_AT_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_file.h"
-gen_table "clockids" "LINUX_CLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h"
-gen_table "clockflags" "LINUX_TIMER_[A-Z_]+[[:space:]]+0x[0-9]+" "compat/linux/linux_timer.h"
-gen_table "clockcpuids" "LINUX_CPUCLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h" "_MASK|_MAX"
+gen_table "clockids" "LINUX_CLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_time.h"
+gen_table "clockflags" "LINUX_TIMER_[A-Z_]+[[:space:]]+0x[0-9]+" "compat/linux/linux_time.h"
+gen_table "clockcpuids" "LINUX_CPUCLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_time.h" "_MASK|_MAX"
gen_table "openflags" "LINUX_O_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_file.h" "O_RDONLY|O_RDWR|O_WRONLY|O_ACCMODE"
gen_table "sigprocmaskhow" "LINUX_SIG_[A-Z]+[[:space:]]+[0-9]+" "compat/linux/linux.h"
diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c
index 3d18b551e6fb..95e0ae145fa6 100644
--- a/sys/amd64/linux/linux_vdso_gtod.c
+++ b/sys/amd64/linux/linux_vdso_gtod.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <amd64/linux/linux.h>
#include <amd64/linux/linux_syscall.h>
#include <compat/linux/linux_errno.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
/* The kernel fixup this at vDSO install */
uintptr_t *kern_timekeep_base = NULL;
diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c
index 4f9892af3fa5..075b6f3af7f4 100644
--- a/sys/amd64/linux32/linux32_vdso_gtod.c
+++ b/sys/amd64/linux32/linux32_vdso_gtod.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <amd64/linux32/linux.h>
#include <amd64/linux32/linux32_syscall.h>
#include <compat/linux/linux_errno.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
/* The kernel fixup this at vDSO install */
uintptr_t *kern_timekeep_base = NULL;
diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c
index 6fdff8335f5d..ff6fe56adbdf 100644
--- a/sys/arm64/linux/linux_vdso_gtod.c
+++ b/sys/arm64/linux/linux_vdso_gtod.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <arm64/linux/linux.h>
#include <arm64/linux/linux_syscall.h>
#include <compat/linux/linux_errno.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
/* The kernel fixup this at vDSO install */
uintptr_t *kern_timekeep_base = NULL;
diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c
index 4a18881934ff..57b5a3ea8d3a 100644
--- a/sys/compat/linux/linux_event.c
+++ b/sys/compat/linux/linux_event.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_event.h>
#include <compat/linux/linux_file.h>
#include <compat/linux/linux_signal.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
typedef uint64_t epoll_udata_t;
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index af16ecfe53fe..74f89e3d49fb 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_futex.h>
#include <compat/linux/linux_misc.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
#define FUTEX_SHARED 0x8 /* shared futex */
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index b2bae8830e86..fd4afd3004be 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_socket.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
#include <contrib/v4l/videodev.h>
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 0791e1ad2cbe..94c645adc099 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#endif
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_ipc64.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
/*
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index a4aa5903e3b9..bc62c6b24d2c 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_file.h>
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_signal.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_sysproto.h>
#include <compat/linux/linux_emul.h>
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 4bff891d4206..5a3cb97c385f 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#endif
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_signal.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_misc.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 528f32f7e163..0397fadb837d 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_file.h>
#include <compat/linux/linux_mib.h>
#include <compat/linux/linux_socket.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
#define SECURITY_CONTEXT_STRING "unconfined"
diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index 102dc4fff4bd..1a9f6cca22e0 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp
#include <compat/linux/linux_dtrace.h>
#include <compat/linux/linux_misc.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
#include <compat/linux/linux_util.h>
/* DTrace init */
diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_time.h
similarity index 98%
rename from sys/compat/linux/linux_timer.h
rename to sys/compat/linux/linux_time.h
index a01411cec847..55a3cd44cafa 100644
--- a/sys/compat/linux/linux_timer.h
+++ b/sys/compat/linux/linux_time.h
@@ -30,8 +30,8 @@
* $FreeBSD$
*/
-#ifndef _LINUX_TIMER_H
-#define _LINUX_TIMER_H
+#ifndef _LINUX_TIME_H
+#define _LINUX_TIME_H
#ifndef __LINUX_ARCH_SIGEV_PREAMBLE_SIZE
#define __LINUX_ARCH_SIGEV_PREAMBLE_SIZE \
@@ -141,4 +141,4 @@ int linux_to_native_itimerspec64(struct itimerspec *,
int linux_to_native_timerflags(int *, int);
-#endif /* _LINUX_TIMER_H */
+#endif /* _LINUX_TIME_H */
diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c
index 5f0f5b28e624..e2cef8347c22 100644
--- a/sys/compat/linux/linux_timer.c
+++ b/sys/compat/linux/linux_timer.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#endif
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
static int
linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c
index 20f754bfaa17..f4f7472ce9d0 100644
--- a/sys/i386/linux/linux_vdso_gtod.c
+++ b/sys/i386/linux/linux_vdso_gtod.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <i386/linux/linux.h>
#include <i386/linux/linux_syscall.h>
#include <compat/linux/linux_errno.h>
-#include <compat/linux/linux_timer.h>
+#include <compat/linux/linux_time.h>
/* The kernel fixup this at vDSO install */
uintptr_t *kern_timekeep_base = NULL;