9 files changed, 3 insertions, 43 deletions
diff --git a/src/mongo/util/processinfo.h b/src/mongo/util/processinfo.h
index 13069b6d81c..942ffc54136 100644
--- a/src/mongo/util/processinfo.h
+++ b/src/mongo/util/processinfo.h
@@ -162,8 +162,6 @@ public:
 
     bool supported();
 
-    static bool blockCheckSupported();
-
     static const std::string& getProcessName() {
         return appInfo().getProcessName();
     }
diff --git a/src/mongo/util/processinfo_freebsd.cpp b/src/mongo/util/processinfo_freebsd.cpp
index a935c485b43..d13b0295e92 100644
--- a/src/mongo/util/processinfo_freebsd.cpp
+++ b/src/mongo/util/processinfo_freebsd.cpp
@@ -173,10 +173,6 @@ bool ProcessInfo::supported() {
     return true;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 // get the number of CPUs available to the scheduler
 boost::optional<unsigned long> ProcessInfo::getNumCoresForProcess() {
     long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index f4a8ac44ead..eae0e9b7764 100644
--- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp
@@ -738,8 +738,4 @@ bool ProcessInfo::checkNumaEnabled() {
     return false;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 }  // namespace mongo
diff --git a/src/mongo/util/processinfo_openbsd.cpp b/src/mongo/util/processinfo_openbsd.cpp
index 38b413ca91f..40ad2fc1a70 100644
--- a/src/mongo/util/processinfo_openbsd.cpp
+++ b/src/mongo/util/processinfo_openbsd.cpp
@@ -190,10 +190,6 @@ bool ProcessInfo::supported() {
     return true;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 // get the number of CPUs available to the scheduler
 boost::optional<unsigned long> ProcessInfo::getNumCoresForProcess() {
     long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
diff --git a/src/mongo/util/processinfo_osx.cpp b/src/mongo/util/processinfo_osx.cpp
index 6ff9fa2509c..632d520f182 100644
--- a/src/mongo/util/processinfo_osx.cpp
+++ b/src/mongo/util/processinfo_osx.cpp
@@ -31,25 +31,21 @@
 
 #include "mongo/platform/basic.h"
 
+#include "mongo/util/processinfo.h"
+
 #include <boost/none.hpp>
 #include <boost/optional.hpp>
 
-#include <iostream>
-#include <mach/mach_host.h>
 #include <mach/mach_init.h>
 #include <mach/mach_traps.h>
 #include <mach/task.h>
 #include <mach/task_info.h>
-#include <mach/vm_map.h>
-#include <mach/vm_statistics.h>
 
-#include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 
-#include "mongo/db/jsobj.h"
+#include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/logv2/log.h"
-#include "mongo/util/processinfo.h"
 
 namespace mongo {
 
@@ -216,8 +212,4 @@ bool ProcessInfo::checkNumaEnabled() {
     return false;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 }  // namespace mongo
diff --git a/src/mongo/util/processinfo_solaris.cpp b/src/mongo/util/processinfo_solaris.cpp
index 6df2af5b13f..95598132526 100644
--- a/src/mongo/util/processinfo_solaris.cpp
+++ b/src/mongo/util/processinfo_solaris.cpp
@@ -223,8 +223,4 @@ bool ProcessInfo::checkNumaEnabled() {
     return groups > 1;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 }  // namespace mongo
diff --git a/src/mongo/util/processinfo_test.cpp b/src/mongo/util/processinfo_test.cpp
index 158c1186268..050835f97ac 100644
--- a/src/mongo/util/processinfo_test.cpp
+++ b/src/mongo/util/processinfo_test.cpp
@@ -47,12 +47,6 @@ TEST(ProcessInfo, SysInfoIsInitialized) {
     }
 }
 
-TEST(ProcessInfo, NonZeroPageSize) {
-    if (ProcessInfo::blockCheckSupported()) {
-        ASSERT_GREATER_THAN(ProcessInfo::getPageSize(), 0u);
-    }
-}
-
 TEST(ProcessInfo, GetNumAvailableCores) {
 #if defined(__APPLE__) || defined(__linux__) || (defined(__sun) && defined(__SVR4)) || \
     defined(_WIN32)
diff --git a/src/mongo/util/processinfo_unknown.cpp b/src/mongo/util/processinfo_unknown.cpp
index e5eebf5a4c3..1011c4dbfef 100644
--- a/src/mongo/util/processinfo_unknown.cpp
+++ b/src/mongo/util/processinfo_unknown.cpp
@@ -55,10 +55,6 @@ bool ProcessInfo::checkNumaEnabled() {
     return false;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return false;
-}
-
 void ProcessInfo::SystemInfo::collectSystemInfo() {}
 
 void ProcessInfo::getExtraInfo(BSONObjBuilder& info) {}
diff --git a/src/mongo/util/processinfo_windows.cpp b/src/mongo/util/processinfo_windows.cpp
index ba9608418aa..3015d22c4d3 100644
--- a/src/mongo/util/processinfo_windows.cpp
+++ b/src/mongo/util/processinfo_windows.cpp
@@ -338,8 +338,4 @@ bool ProcessInfo::checkNumaEnabled() {
     return numaNodeCount > 1;
 }
 
-bool ProcessInfo::blockCheckSupported() {
-    return true;
-}
-
 }  // namespace mongo