Automated rollback of changelist 207007153

PiperOrigin-RevId: 207037226
Change-Id: I8b5f1a056d4f3eab17846f2e0193bb737ecb5428

4 files changed, 27 insertions, 6 deletions

diff --git a/pkg/abi/BUILD b/pkg/abi/BUILD
index c014d2c4b..f1e6bac67 100644
--- a/pkg/abi/BUILD
+++ b/pkg/abi/BUILD
@@ -1,13 +1,24 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
+
+go_stateify(
+    name = "abi_state",
+    srcs = [
+        "abi.go",
+    ],
+    out = "abi_state.go",
+    package = "abi",
+)
 
 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 ac4ceefbc..38b4829c9 100644
--- a/pkg/abi/linux/BUILD
+++ b/pkg/abi/linux/BUILD
@@ -4,7 +4,19 @@
 
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library")
+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",
+)
 
 go_library(
     name = "linux",
@@ -29,6 +41,7 @@ go_library(
         "ipc.go",
         "limits.go",
         "linux.go",
+        "linux_state.go",
         "mm.go",
         "netdevice.go",
         "netlink.go",
@@ -54,5 +67,6 @@ 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 80e5b1af1..f597ef4f5 100644
--- a/pkg/abi/linux/bpf.go
+++ b/pkg/abi/linux/bpf.go
@@ -15,8 +15,6 @@
 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 b640f7627..84b6ccc87 100644
--- a/pkg/abi/linux/tty.go
+++ b/pkg/abi/linux/tty.go
@@ -38,8 +38,6 @@ 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