diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index db65978..e5f9b41 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -573,8 +573,8 @@
 
             if ((worst == AID_SYSTEM) && mPrune.worstPidOfSystemEnabled()) {
                 // begin scope of PID sorted list
-                std::unique_ptr<const PidEntry *[]> sorted = stats.sort(
-                    worst, (pid_t)0, 2, id, worst);
+                std::unique_ptr<const PidEntry *[]> sorted = stats.sortPids(
+                    worst, (pid_t)0, 2, id);
                 if (sorted.get() && sorted[0] && sorted[1]) {
                     worstPid = sorted[0]->getKey();
                     second_worst_sizes = worst_sizes
diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h
index b32c27d..52f1d5b 100644
--- a/logd/LogStatistics.h
+++ b/logd/LogStatistics.h
@@ -455,8 +455,8 @@
                                              size_t len, log_id id) {
         return uidTable[id].sort(uid, pid, len);
     }
-    std::unique_ptr<const PidEntry *[]> sort(uid_t uid, pid_t pid,
-                                             size_t len, log_id id, uid_t) {
+    std::unique_ptr<const PidEntry *[]> sortPids(uid_t uid, pid_t pid,
+                                             size_t len, log_id id) {
         return pidSystemTable[id].sort(uid, pid, len);
     }
 
diff --git a/logd/main.cpp b/logd/main.cpp
index 3095f7f..69ba896 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -212,7 +212,7 @@
 }
 
 static int fdDmesg = -1;
-void inline android::prdebug(const char *fmt, ...) {
+void android::prdebug(const char *fmt, ...) {
     if (fdDmesg < 0) {
         return;
     }
