diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-08 14:59:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 14:59:31 -0700 |
| commit | 796a85e24511b7926a1fccb7cc695900d3ce0922 (patch) | |
| tree | 3ca0bf766749425f4067bc857a96c5b2a166c476 | |
| parent | 6bdc0ca86acd8a50de2df9433a195baefce2b3a7 (diff) | |
| parent | 4df54bc4a85eacfff9c81dc0a7ebf3fd88a99982 (diff) | |
| download | core-796a85e24511b7926a1fccb7cc695900d3ce0922.tar.gz | |
Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
| -rw-r--r-- | libcutils/sched_policy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c index 3fe83b3e5..20771c0c5 100644 --- a/libcutils/sched_policy.c +++ b/libcutils/sched_policy.c @@ -124,32 +124,32 @@ static void __initialize(void) { #if CAN_SET_SP_SYSTEM filename = "/dev/cpuctl/tasks"; - system_cgroup_fd = open(filename, O_WRONLY | O_CLOEXEC); + system_cgroup_fd = open(filename, O_WRONLY); if (system_cgroup_fd < 0) { SLOGV("open of %s failed: %s\n", filename, strerror(errno)); } #endif filename = "/dev/cpuctl/foreground/tasks"; - fg_cgroup_fd = open(filename, O_WRONLY | O_CLOEXEC); + fg_cgroup_fd = open(filename, O_WRONLY); if (fg_cgroup_fd < 0) { SLOGE("open of %s failed: %s\n", filename, strerror(errno)); } filename = "/dev/cpuctl/bg_non_interactive/tasks"; - bg_cgroup_fd = open(filename, O_WRONLY | O_CLOEXEC); + bg_cgroup_fd = open(filename, O_WRONLY); if (bg_cgroup_fd < 0) { SLOGE("open of %s failed: %s\n", filename, strerror(errno)); } filename = "/dev/cpuctl/audio_app/tasks"; - audio_app_cgroup_fd = open(filename, O_WRONLY | O_CLOEXEC); + audio_app_cgroup_fd = open(filename, O_WRONLY); if (audio_app_cgroup_fd < 0) { SLOGV("open of %s failed: %s\n", filename, strerror(errno)); } filename = "/dev/cpuctl/audio_sys/tasks"; - audio_sys_cgroup_fd = open(filename, O_WRONLY | O_CLOEXEC); + audio_sys_cgroup_fd = open(filename, O_WRONLY); if (audio_sys_cgroup_fd < 0) { SLOGV("open of %s failed: %s\n", filename, strerror(errno)); } |