Merge pull request google#7167 from zhlhahaha:2438

PiperOrigin-RevId: 433048695
gristlabs · Mar 7, 2022 · 4c7dba9 · 4c7dba9
2 parents 21a689b + 4ecf66c
commit 4c7dba9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...s/basic/integrationtest/Dockerfile.x86_64 → images/basic/integrationtest/Dockerfile b/...s/basic/integrationtest/Dockerfile.x86_64 → images/basic/integrationtest/Dockerfile
diff --git a/pkg/cpuid/cpuid_arm64.go b/pkg/cpuid/cpuid_arm64.go
@@ -31,6 +31,8 @@ import (
 // Documentation/arm64/elf_hwcaps.rst for more info.
 //
 // Currently, only the HWCAP bits are supported.
+//
+// +stateify savable
 type FeatureSet struct {
 	hwCap      uint
 	cpuFreqMHz float64