resolve merge conflicts of 14b307fa47 to mnc-dr2-dev.

Change-Id: I82f17b717b509553389185e6bc9886c105fcd59d
This commit is contained in:
Tim Murray 2015-12-18 10:55:00 -08:00
commit e9cf477488

View file

@ -131,9 +131,6 @@ static void __initialize(void) {
bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);
filename = "/dev/cpuset/system-background/tasks";
system_bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);
if (system_bg_cpuset_fd < 0) {
SLOGE("initialize of system-bg failed: %s\n", strerror(errno));
}
#ifdef USE_SCHEDBOOST
filename = "/sys/fs/cgroup/stune/foreground/tasks";
fg_schedboost_fd = open(filename, O_WRONLY | O_CLOEXEC);