Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e5112c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "sched: Add 'flags' argument to sched_{set,get}attr() syscalls""

parents 3b61d442 45869479

include/linux/syscalls.h

+2 −4
Original line number Diff line number Diff line
@@ -280,15 +280,13 @@ asmlinkage long sys_sched_setscheduler(pid_t pid, int policy, 
asmlinkage long sys_sched_setparam(pid_t pid,

					struct sched_param __user *param);

asmlinkage long sys_sched_setattr(pid_t pid,

					struct sched_attr __user *attr,

					unsigned int flags);

					struct sched_attr __user *attr);

asmlinkage long sys_sched_getscheduler(pid_t pid);

asmlinkage long sys_sched_getparam(pid_t pid,

					struct sched_param __user *param);

asmlinkage long sys_sched_getattr(pid_t pid,

					struct sched_attr __user *attr,

					unsigned int size,

					unsigned int flags);

					unsigned int size);

asmlinkage long sys_sched_setaffinity(pid_t pid, unsigned int len,

					unsigned long __user *user_mask_ptr);

asmlinkage long sys_sched_getaffinity(pid_t pid, unsigned int len,

kernel/sched/core.c

+5 −6
Original line number Diff line number Diff line
@@ -4374,14 +4374,13 @@ SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param) 
 * @pid: the pid in question.

 * @attr: structure containing the extended parameters.

 */

SYSCALL_DEFINE3(sched_setattr, pid_t, pid, struct sched_attr __user *, uattr,

			       unsigned int, flags)

SYSCALL_DEFINE2(sched_setattr, pid_t, pid, struct sched_attr __user *, uattr)

{

	struct sched_attr attr;

	struct task_struct *p;

	int retval;



	if (!uattr || pid < 0 || flags)

	if (!uattr || pid < 0)

		return -EINVAL;



	if (sched_copy_attr(uattr, &attr))
@@ -4508,8 +4507,8 @@ err_size: 
 * @attr: structure containing the extended parameters.

 * @size: sizeof(attr) for fwd/bwd comp.

 */

SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,

		unsigned int, size, unsigned int, flags)

SYSCALL_DEFINE3(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,

		unsigned int, size)

{

	struct sched_attr attr = {

		.size = sizeof(struct sched_attr),
@@ -4518,7 +4517,7 @@ SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr, 
	int retval;



	if (!uattr || pid < 0 || size > PAGE_SIZE ||

	    size < SCHED_ATTR_SIZE_VER0 || flags)

	    size < SCHED_ATTR_SIZE_VER0)

		return -EINVAL;



	rcu_read_lock();