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

Move compat.linux.map_sched_prio sysctl definition to linux_mib.c so it is

Browse Source 
only defined by linux_common kernel module and not both linux and linux64
modules.

Reported by:	Yuri Pankov <ypankov@fastmail.com>
This commit is contained in:
Tijl Coosemans 2020-03-05 14:41:27 +00:00
parent 2b37373c48
commit b4147bf6b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=358673
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/compat/linux/linux_mib.c
View File

@ -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);

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

@ -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_ */

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

@ -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)