am f7180d1d: am 98c6de69: Merge "Don\'t set cgroup policy when updating cpusets." into mnc-dev

* commit 'f7180d1d2d2c30dfdfa50358fcfe1c698ef96e20':
  Don't set cgroup policy when updating cpusets.
This commit is contained in:
Tim Murray 2015-06-22 22:23:04 +00:00 committed by Android Git Automerger
commit 0ace5f20f4
1 changed files with 1 additions and 4 deletions

View File

@ -269,10 +269,7 @@ int set_cpuset_policy(int tid, SchedPolicy policy)
return -errno;
}
// we do both setting of cpuset and setting of cgroup
// ensures that backgrounded apps are actually deprioritized
// including on core 0
return set_sched_policy(tid, policy);
return 0;
#endif
}