d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Use inlined LINUX_KERNVER for tests to improve readability

Browse Source 
MFC after:		1 month
This commit is contained in:
Dmitry Chagin 2023-04-26 16:57:30 +03:00
parent 76f8584e49
commit e185d83fc4
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/linux/linux_elf.c
View File

@ -513,7 +513,7 @@ __linuxN(copyout_auxargs)(struct image_params *imgp, uintptr_t base)
* is not present.
* Also see linux_times() implementation.
*/
if (linux_kernver(curthread) >= LINUX_KERNVER_2004000)
if (linux_kernver(td) >= LINUX_KERNVER(2,4,0))
AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, stclohz);
AUXARGS_ENTRY(pos, AT_PAGESZ, args->pagesz);
AUXARGS_ENTRY(pos, AT_PHDR, args->phdr);

6
sys/compat/linux/linux_mib.h
View File

@ -57,12 +57,6 @@ int linux_kernver(struct thread *td);
#define LINUX_XKERNVERSTR(x) LINUX_KERNVERSTR(x)
#define LINUX_VERSION_STR LINUX_XKERNVERSTR(LINUX_KVERSION.LINUX_KPATCHLEVEL.LINUX_KSUBLEVEL)
#define LINUX_KERNVER_2004000 LINUX_KERNVER(2,4,0)
#define LINUX_KERNVER_2006039 LINUX_KERNVER(2,6,39)
#define LINUX_KERNVER_5004000 LINUX_KERNVER(5,4,0)
#define linux_use54(t) (linux_kernver(t) >= LINUX_KERNVER_5004000)
extern int linux_debug;
extern int linux_default_openfiles;
extern int linux_default_stacksize;

4
sys/compat/linux/linux_misc.c
View File

@ -384,7 +384,7 @@ struct l_times_argv {
#define CONVOTCK(r) (r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
#define CONVNTCK(r) (r.tv_sec * stclohz + r.tv_usec / (1000000 / stclohz))
#define CONVTCK(r) (linux_kernver(td) >= LINUX_KERNVER_2004000 ? \
#define CONVTCK(r) (linux_kernver(td) >= LINUX_KERNVER(2,4,0) ? \
CONVNTCK(r) : CONVOTCK(r))
int
@ -850,7 +850,7 @@ linux_waitid(struct thread *td, struct linux_waitid_args *args)
idtype = P_PID;
break;
case LINUX_P_PGID:
if (linux_use54(td) && args->id == 0) {
if (linux_kernver(td) >= LINUX_KERNVER(5,4,0) && args->id == 0) {
p = td->td_proc;
PROC_LOCK(p);
id = p->p_pgid;

2
sys/compat/linux/linux_signal.c
View File

@ -776,7 +776,7 @@ lsiginfo_to_siginfo(struct thread *td, const l_siginfo_t *lsi,
switch (lsi->lsi_code) {
case LINUX_SI_TKILL:
if (linux_kernver(td) >= LINUX_KERNVER_2006039) {
if (linux_kernver(td) >= LINUX_KERNVER(2,6,39)) {
linux_msg(td, "SI_TKILL forbidden since 2.6.39");
return (EPERM);
}