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

Commit 68f5503b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Ingo Molnar:
 "An autogroup nice level adjustment bug fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/autogroup: Fix 64-bit kernel nice level adjustment
parents bf7f1c7e 83929cce

kernel/sched/auto_group.c

+3 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice) 
{

	static unsigned long next = INITIAL_JIFFIES;

	struct autogroup *ag;

	unsigned long shares;

	int err;



	if (nice < MIN_NICE || nice > MAX_NICE)
@@ -230,9 +231,10 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice) 


	next = HZ / 10 + jiffies;

	ag = autogroup_task_get(p);

	shares = scale_load(sched_prio_to_weight[nice + 20]);



	down_write(&ag->lock);

	err = sched_group_set_shares(ag->tg, sched_prio_to_weight[nice + 20]);

	err = sched_group_set_shares(ag->tg, shares);

	if (!err)

		ag->nice = nice;

	up_write(&ag->lock);