Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

4 files changed, 6 insertions, 27 deletions

diff --git a/pkg/abi/BUILD b/pkg/abi/BUILD
index f1e6bac67..c014d2c4b 100644
--- a/pkg/abi/BUILD
+++ b/pkg/abi/BUILD
@@ -1,24 +1,13 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "abi_state",
-    srcs = [
-        "abi.go",
-    ],
-    out = "abi_state.go",
-    package = "abi",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_library(
     name = "abi",
     srcs = [
         "abi.go",
-        "abi_state.go",
         "flag.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/abi",
     visibility = ["//:sandbox"],
-    deps = ["//pkg/state"],
 )
diff --git a/pkg/abi/linux/BUILD b/pkg/abi/linux/BUILD
index 38b4829c9..ac4ceefbc 100644
--- a/pkg/abi/linux/BUILD
+++ b/pkg/abi/linux/BUILD
@@ -4,19 +4,7 @@
 
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "linux_state",
-    srcs = [
-        "binder.go",
-        "bpf.go",
-        "time.go",
-        "tty.go",
-    ],
-    out = "linux_state.go",
-    package = "linux",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_library(
     name = "linux",
@@ -41,7 +29,6 @@ go_library(
         "ipc.go",
         "limits.go",
         "linux.go",
-        "linux_state.go",
         "mm.go",
         "netdevice.go",
         "netlink.go",
@@ -67,6 +54,5 @@ go_library(
         "//pkg/abi",
         "//pkg/binary",
         "//pkg/bits",
-        "//pkg/state",
     ],
 )
diff --git a/pkg/abi/linux/bpf.go b/pkg/abi/linux/bpf.go
index f597ef4f5..80e5b1af1 100644
--- a/pkg/abi/linux/bpf.go
+++ b/pkg/abi/linux/bpf.go
@@ -15,6 +15,8 @@
 package linux
 
 // BPFInstruction is a raw BPF virtual machine instruction.
+//
+// +stateify savable
 type BPFInstruction struct {
 	// OpCode is the operation to execute.
 	OpCode uint16
diff --git a/pkg/abi/linux/tty.go b/pkg/abi/linux/tty.go
index 84b6ccc87..b640f7627 100644
--- a/pkg/abi/linux/tty.go
+++ b/pkg/abi/linux/tty.go
@@ -38,6 +38,8 @@ type Termios struct {
 
 // KernelTermios is struct ktermios/struct termios2, defined in
 // uapi/asm-generic/termbits.h.
+//
+// +stateify savable
 type KernelTermios struct {
 	InputFlags        uint32
 	OutputFlags       uint32