commit 0ec36ec5ff7eccbaad8e5ccaf1471ef5f0daaf1f
author Elliott Hughes <enh@google.com> Mon Jun 12 19:53:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 12 19:53:57 2017 +0000
tree fbec84d52bd2e7ea1b322dce2e7f8eb3ed28e074
parent defa9713150b2d14fb279a8a44436779452b076c
parent 578f56cd04998640e9b623925b3ddf055433a502

Merge "Fix prctl argument type"
am: 6cc5927e0d

Change-Id: Iee476e7734bde72bdaebf9d1643c4b3e60f2339e

libcutils/sched_policy.cpp

diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp
index e29a844..7e38535 100644
--- a/libcutils/sched_policy.cpp
+++ b/libcutils/sched_policy.cpp
@@ -340,7 +340,7 @@
     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) {
@@ -348,7 +348,7 @@
         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));
             }