From 60add78980737a7330100d98bf6a214892dee3c0 Mon Sep 17 00:00:00 2001
From: Michael Pratt <mpratt@google.com>
Date: Wed, 1 Aug 2018 19:56:12 -0700
Subject: Automated rollback of changelist 207007153

PiperOrigin-RevId: 207037226
Change-Id: I8b5f1a056d4f3eab17846f2e0193bb737ecb5428
---
 pkg/cpuid/BUILD    | 15 +++++++++++++--
 pkg/cpuid/cpuid.go |  2 --
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'pkg/cpuid')

diff --git a/pkg/cpuid/BUILD b/pkg/cpuid/BUILD
index 46fc4703b..9a0ca1b33 100644
--- a/pkg/cpuid/BUILD
+++ b/pkg/cpuid/BUILD
@@ -1,16 +1,27 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
+
+go_stateify(
+    name = "cpuid_state",
+    srcs = ["cpuid.go"],
+    out = "cpuid_state.go",
+    package = "cpuid",
+)
 
 go_library(
     name = "cpuid",
     srcs = [
         "cpu_amd64.s",
         "cpuid.go",
+        "cpuid_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/cpuid",
     visibility = ["//:sandbox"],
-    deps = ["//pkg/log"],
+    deps = [
+        "//pkg/log",
+        "//pkg/state",
+    ],
 )
 
 go_test(
diff --git a/pkg/cpuid/cpuid.go b/pkg/cpuid/cpuid.go
index e91e34dc7..b486ab037 100644
--- a/pkg/cpuid/cpuid.go
+++ b/pkg/cpuid/cpuid.go
@@ -409,8 +409,6 @@ func (f Feature) flagString(cpuinfoOnly bool) string {
 }
 
 // FeatureSet is a set of Features for a cpu.
-//
-// +stateify savable
 type FeatureSet struct {
 	// Set is the set of features that are enabled in this FeatureSet.
 	Set map[Feature]bool
-- 
cgit v1.2.3