From nobody Wed Mar 01 08:43:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRSS566Kvz3vbqk; Wed, 1 Mar 2023 08:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRSS54TsCz466X; Wed, 1 Mar 2023 08:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/M9isRZCtMBZFKDQQybpxCSKJ9D50Eov1hfKCWFWZzU=; b=IglthLcjwb/9lsThVCcDDka0ZmROODYRrx4RKH719dVwKE+1VVascas/jjhTIgNK9seWmm zfGY8/w8v15peG6dGMucGlySm+qw9dGSAZ8UltnpUmUf75dth6R2fu+uHFc0ZoBK+sWC1e RkCkNq5hF+8Wct7kZQV9xIVTy0PulXHz/nxiMJfiGDduc47LBnU3VG2kIMpMNbOLvWa1hy hI+N0AFsna35lM5SLpyoF6p4Rk8+5BNgveDJRdL4LGsFnBgLD6NXgtd/rs34VfBVHGrMVQ /EiGjK9ILuka4YaR4Sp54t/s++36dKFHYjiY7XKiHrXbqn/0DdYPWYhPryUIXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/M9isRZCtMBZFKDQQybpxCSKJ9D50Eov1hfKCWFWZzU=; b=ZFuovvBxY0cKeY1G34NkQmhCZqvCjrYAE3zTILU3akTYLw+GYDOA+VZwp22UFNvuiVNxot chKh/zFQdcglhwU58+Sy1KDeIbSOufzjhgwPDa7+OHwo/I0CsNRn8uGxXnnmA2Bdq28rga R2q+hhFlxWkk7cVuwEbL+gs7se4yvjv4hg2X8Ul+NaHki9+zNgURz37BkoB28ijqWjMOZk gy6NhFICI+oOOn7OUF10KoaHEOBhHHbIa4bsljvcXmFR2xidczUZDP5gW5XteIUTD0Dr+O o9Qdv0ssv3sbzBsyL5+jFLMNxxpWy1rxOu/Wg6a5f+lxxkAh2qfb12+1khC37w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660197; a=rsa-sha256; cv=none; b=HHWSWAzi0Ax9caGWZx3wOQKGSAWVeV7YufFbNSBcHzH8l1FGubygorEU7CzUM5kYt3qcIz eeAygW/iN8GqBcmw+/SE+ZrdBOq3G1zkmxIghNjYEGn8fbA7dBud6jicBu6kSvXP25cyUb OjQMCTLBazzRGjLbIUJXEyZWY9z6RjsEZNf2i+0raqPMwc1BOBz1179/0IBrPTuHByFNzE 2B9nXqBTtRltd6va7ZoLJXPyC18HWlqjC6VL080VX63HlrErLy1ICSeG5/PToFehPdbdJa 9XhIcKvPzAyUeYvOU/ADJkpWFrmIATMxo/ISmyU16GzQ2t7He8sNkxcErF3tdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRSS52dzczSKm; Wed, 1 Mar 2023 08:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3218hH5t028627; Wed, 1 Mar 2023 08:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hHpS028626; Wed, 1 Mar 2023 08:43:17 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:17 GMT Message-Id: <202303010843.3218hHpS028626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d41e592190fd - stable/13 - linux(4): Rename linux_timer.h to linux_time.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d41e592190fdd7ae643b0abbf28e3607c1ac25ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d41e592190fdd7ae643b0abbf28e3607c1ac25ab commit d41e592190fdd7ae643b0abbf28e3607c1ac25ab Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:33 +0000 Commit: Dmitry Chagin 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 #include -#include +#include #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 #include #include -#include +#include /* 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 #include #include -#include +#include /* 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 #include #include -#include +#include /* 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 #include #include -#include +#include #include 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 #include #include -#include +#include #include #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 #include #include -#include +#include #include #include 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 #include -#include +#include #include /* 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #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 #include -#include +#include #include /* 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 #include #endif -#include +#include 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 #include #include -#include +#include /* The kernel fixup this at vDSO install */ uintptr_t *kern_timekeep_base = NULL;