 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sched.c,v 1.65 2011/08/18 02:26:38 christos Exp $	*/
+/*	$NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Linux compatibility module. Try to deal with scheduler related syscalls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.65 2011/08/18 02:26:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/syscallargs.h>
 #include <sys/wait.h>
 #include <sys/kauth.h>
 #include <sys/ptrace.h>
 #include <sys/atomic.h>
 @@ -408,62 +408,62 @@ linux_sys_sched_setparam(struct lwp *l,
 	struct linux_sched_param lp;
 	struct sched_param sp;
 	if (SCARG(uap, pid) < 0 || SCARG(uap, sp) == NULL) {
 		error = EINVAL;
 		goto out;
+	}
 	error = copyin(SCARG(uap, sp), &lp, sizeof(lp));
 	if (error)
 		goto out;
 	/* We need the current policy in Linux terms. */
-	error = do_sched_getparam(0, SCARG(uap, pid), &policy, NULL);
+	error = do_sched_getparam(SCARG(uap, pid), 0, &policy, NULL);
 	if (error)
 		goto out;
 	error = sched_native2linux(policy, NULL, &policy, NULL);
 	if (error)
 		goto out;
 	error = sched_linux2native(policy, &lp, &policy, &sp);
 	if (error)
 		goto out;
-	error = do_sched_setparam(0, SCARG(uap, pid), policy, &sp);
+	error = do_sched_setparam(SCARG(uap, pid), 0, policy, &sp);
 	if (error)
 		goto out;
  out:
 	return error;
+}
 int
 linux_sys_sched_getparam(struct lwp *l, const struct linux_sys_sched_getparam_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(linux_pid_t) pid;
 		syscallarg(struct linux_sched_param *) sp;
 	} */
 	struct linux_sched_param lp;
 	struct sched_param sp;
 	int error, policy;
 	if (SCARG(uap, pid) < 0 || SCARG(uap, sp) == NULL) {
 		error = EINVAL;
 		goto out;
+	}
-	error = do_sched_getparam(0, SCARG(uap, pid), &policy, &sp);
+	error = do_sched_getparam(SCARG(uap, pid), 0, &policy, &sp);
 	if (error)
 		goto out;
 	DPRINTF(("%s: native: policy %d, priority %d\n",
 	    __func__, policy, sp.sched_priority));
 	error = sched_native2linux(policy, &sp, NULL, &lp);
 	if (error)
 		goto out;
 	DPRINTF(("%s: linux: policy %d, priority %d\n",
 	    __func__, policy, lp.sched_priority));
 	error = copyout(&lp, SCARG(uap, sp), sizeof(lp));
 	if (error)
 @@ -492,45 +492,45 @@ linux_sys_sched_setscheduler(struct lwp
 	error = copyin(SCARG(uap, sp), &lp, sizeof(lp));
 	if (error)
 		goto out;
 	DPRINTF(("%s: linux: policy %d, priority %d\n",
 	    __func__, SCARG(uap, policy), lp.sched_priority));
 	error = sched_linux2native(SCARG(uap, policy), &lp, &policy, &sp);
 	if (error)
 		goto out;
 	DPRINTF(("%s: native: policy %d, priority %d\n",
 	    __func__, policy, sp.sched_priority));
-	error = do_sched_setparam(0, SCARG(uap, pid), policy, &sp);
+	error = do_sched_setparam(SCARG(uap, pid), 0, policy, &sp);
 	if (error)
 		goto out;
  out:
 	return error;
+}
 int
 linux_sys_sched_getscheduler(struct lwp *l, const struct linux_sys_sched_getscheduler_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(linux_pid_t) pid;
 	} */
 	int error, policy;
 	*retval = -1;
-	error = do_sched_getparam(0, SCARG(uap, pid), &policy, NULL);
+	error = do_sched_getparam(SCARG(uap, pid), 0, &policy, NULL);
 	if (error)
 		goto out;
 	error = sched_native2linux(policy, NULL, &policy, NULL);
 	if (error)
 		goto out;
 	*retval = policy;
  out:
 	return error;
+}