Author: tijl
Date: Thu Mar 5 14:41:27 2020
New Revision: 358673
URL: https://svnweb.freebsd.org/changeset/base/358673
Log:
Move compat.linux.map_sched_prio sysctl definition to linux_mib.c so it is
only defined by linux_common kernel module and not both linux and linux64
modules.
Reported by: Yuri Pankov <ypan...@fastmail.com>
Modified:
head/sys/compat/linux/linux_mib.c
head/sys/compat/linux/linux_mib.h
head/sys/compat/linux/linux_misc.c
Modified: head/sys/compat/linux/linux_mib.c
==============================================================================
--- head/sys/compat/linux/linux_mib.c Thu Mar 5 14:13:22 2020
(r358672)
+++ head/sys/compat/linux/linux_mib.c Thu Mar 5 14:41:27 2020
(r358673)
@@ -71,6 +71,11 @@ int linux_preserve_vstatus = 0;
SYSCTL_INT(_compat_linux, OID_AUTO, preserve_vstatus, CTLFLAG_RWTUN,
&linux_preserve_vstatus, 0, "Preserve VSTATUS termios(4) flag");
+bool linux_map_sched_prio = true;
+SYSCTL_BOOL(_compat_linux, OID_AUTO, map_sched_prio, CTLFLAG_RDTUN,
+ &linux_map_sched_prio, 0, "Map scheduler priorities to Linux priorities "
+ "(not POSIX compliant)");
+
static int linux_set_osname(struct thread *td, char *osname);
static int linux_set_osrelease(struct thread *td, char *osrelease);
static int linux_set_oss_version(struct thread *td, int oss_version);
Modified: head/sys/compat/linux/linux_mib.h
==============================================================================
--- head/sys/compat/linux/linux_mib.h Thu Mar 5 14:13:22 2020
(r358672)
+++ head/sys/compat/linux/linux_mib.h Thu Mar 5 14:41:27 2020
(r358673)
@@ -64,5 +64,6 @@ int linux_kernver(struct thread *td);
extern int linux_ignore_ip_recverr;
extern int linux_preserve_vstatus;
+extern bool linux_map_sched_prio;
#endif /* _LINUX_MIB_H_ */
Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c Thu Mar 5 14:13:22 2020
(r358672)
+++ head/sys/compat/linux/linux_misc.c Thu Mar 5 14:41:27 2020
(r358673)
@@ -144,11 +144,6 @@ struct l_pselect6arg {
l_size_t ss_len;
};
-static bool map_sched_prio = true;
-SYSCTL_BOOL(_compat_linux, OID_AUTO, map_sched_prio, CTLFLAG_RDTUN,
- &map_sched_prio, 0, "Map scheduler priorities to Linux priorities "
- "(not POSIX compliant)");
-
static int linux_utimensat_nsec_valid(l_long);
@@ -1424,7 +1419,7 @@ linux_sched_setscheduler(struct thread *td,
if (error)
return (error);
- if (map_sched_prio) {
+ if (linux_map_sched_prio) {
switch (policy) {
case SCHED_OTHER:
if (sched_param.sched_priority != 0)
@@ -1494,7 +1489,7 @@ linux_sched_get_priority_max(struct thread *td,
{
struct sched_get_priority_max_args bsd;
- if (map_sched_prio) {
+ if (linux_map_sched_prio) {
switch (args->policy) {
case LINUX_SCHED_OTHER:
td->td_retval[0] = 0;
@@ -1530,7 +1525,7 @@ linux_sched_get_priority_min(struct thread *td,
{
struct sched_get_priority_min_args bsd;
- if (map_sched_prio) {
+ if (linux_map_sched_prio) {
switch (args->policy) {
case LINUX_SCHED_OTHER:
td->td_retval[0] = 0;
@@ -1934,7 +1929,7 @@ linux_sched_setparam(struct thread *td,
if (tdt == NULL)
return (ESRCH);
- if( map_sched_prio ) {
+ if (linux_map_sched_prio) {
error = kern_sched_getscheduler(td, tdt, &policy);
if (error)
goto out;
@@ -1990,7 +1985,7 @@ linux_sched_getparam(struct thread *td,
return (error);
}
- if (map_sched_prio) {
+ if (linux_map_sched_prio) {
error = kern_sched_getscheduler(td, tdt, &policy);
PROC_UNLOCK(tdt->td_proc);
if (error)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
