Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

2 files changed, 7 insertions, 13 deletions

diff --git a/pkg/sentry/kernel/time/BUILD b/pkg/sentry/kernel/time/BUILD
index b3ed42aa4..5d8db2273 100644
--- a/pkg/sentry/kernel/time/BUILD
+++ b/pkg/sentry/kernel/time/BUILD
@@ -1,30 +1,18 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "time_state",
-    srcs = [
-        "time.go",
-    ],
-    out = "time_state.go",
-    package = "time",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_library(
     name = "time",
     srcs = [
         "context.go",
         "time.go",
-        "time_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/time",
     visibility = ["//pkg/sentry:internal"],
     deps = [
         "//pkg/abi/linux",
-        "//pkg/log",
         "//pkg/sentry/context",
-        "//pkg/state",
         "//pkg/syserror",
         "//pkg/waiter",
     ],
diff --git a/pkg/sentry/kernel/time/time.go b/pkg/sentry/kernel/time/time.go
index c223c2f19..6eadd2878 100644
--- a/pkg/sentry/kernel/time/time.go
+++ b/pkg/sentry/kernel/time/time.go
@@ -42,6 +42,8 @@ const (
 //
 // Time may represent time with respect to any clock and may not have any
 // meaning in the real world.
+//
+// +stateify savable
 type Time struct {
 	ns int64
 }
@@ -286,6 +288,8 @@ type TimerListener interface {
 }
 
 // Setting contains user-controlled mutable Timer properties.
+//
+// +stateify savable
 type Setting struct {
 	// Enabled is true if the timer is running.
 	Enabled bool
@@ -371,6 +375,8 @@ func (s Setting) advancedTo(now Time) (Setting, uint64) {
 //
 // Timers should be created using NewTimer and must be cleaned up by calling
 // Timer.Destroy when no longer used.
+//
+// +stateify savable
 type Timer struct {
 	// clock is the time source. clock is immutable.
 	clock Clock