Merge branch 'master' into pr_syscall_linux

1 files changed, 5 insertions, 7 deletions

diff --git a/test/util/save_util.cc b/test/util/save_util.cc
index 05f52b80d..384d626f0 100644
--- a/test/util/save_util.cc
+++ b/test/util/save_util.cc
@@ -16,8 +16,8 @@
 
 #include <stddef.h>
 #include <stdlib.h>
-#include <sys/syscall.h>
 #include <unistd.h>
+
 #include <atomic>
 #include <cerrno>
 
@@ -61,13 +61,11 @@ void DisableSave::reset() {
   }
 }
 
-void MaybeSave() {
-  if (CooperativeSaveEnabled() && !save_disable.load()) {
-    int orig_errno = errno;
-    syscall(SYS_create_module, nullptr, 0);
-    errno = orig_errno;
-  }
+namespace internal {
+bool ShouldSave() {
+  return CooperativeSaveEnabled() && (save_disable.load() == 0);
 }
+}  // namespace internal
 
 }  // namespace testing
 }  // namespace gvisor