diff options
| author | Elliott Hughes <enh@google.com> | 2017-06-12 20:00:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-12 20:00:05 +0000 |
| commit | 2daf8683f3cd26d69c30da50adc5d03cce96d130 (patch) | |
| tree | e171e21dbd7a3c1276c8f5335a08f5b9448d2986 /libcutils/sched_policy.cpp | |
| parent | 5e4da5195fefa0432904480b07be950eef1b4a8b (diff) | |
| parent | 184fa60c23e8b6092903529934c86267e3a1df8c (diff) | |
| download | system_core-2daf8683f3cd26d69c30da50adc5d03cce96d130.tar.gz system_core-2daf8683f3cd26d69c30da50adc5d03cce96d130.tar.bz2 system_core-2daf8683f3cd26d69c30da50adc5d03cce96d130.zip | |
Merge "Fix prctl argument type" am: 6cc5927e0d am: 316b7334b8
am: 184fa60c23
Change-Id: Ibc96f273e17928f75148ab79c8a0aa1db166ba53
Diffstat (limited to 'libcutils/sched_policy.cpp')
| -rw-r--r-- | libcutils/sched_policy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp index 7170b4826..3472a67b2 100644 --- a/libcutils/sched_policy.cpp +++ b/libcutils/sched_policy.cpp @@ -343,7 +343,7 @@ int set_cpuset_policy(int tid, SchedPolicy policy) return 0; } -static void set_timerslack_ns(int tid, unsigned long long slack) { +static void set_timerslack_ns(int tid, unsigned long slack) { // v4.6+ kernels support the /proc/<tid>/timerslack_ns interface. // TODO: once we've backported this, log if the open(2) fails. if (__sys_supports_timerslack) { @@ -351,7 +351,7 @@ static void set_timerslack_ns(int tid, unsigned long long slack) { snprintf(buf, sizeof(buf), "/proc/%d/timerslack_ns", tid); int fd = open(buf, O_WRONLY | O_CLOEXEC); if (fd != -1) { - int len = snprintf(buf, sizeof(buf), "%llu", slack); + int len = snprintf(buf, sizeof(buf), "%lu", slack); if (write(fd, buf, len) != len) { SLOGE("set_timerslack_ns write failed: %s\n", strerror(errno)); } |