Merge pull request #6776 from milantracy:arm64

PiperOrigin-RevId: 405451989

3 files changed, 3 insertions, 1 deletions

diff --git a/pkg/cpuid/cpuid.go b/pkg/cpuid/cpuid.go
index 4d5e062a8..e1ea9b32c 100644
--- a/pkg/cpuid/cpuid.go
+++ b/pkg/cpuid/cpuid.go
@@ -43,7 +43,7 @@ func HostFeatureSet() *FeatureSet {
 	return hostFeatureSet
 }
 
-var hostFeatureSet = getHostFeatureSet()
+var hostFeatureSet *FeatureSet
 
 // ErrIncompatible is returned by FeatureSet.HostCompatible if fs is not a
 // subset of the host feature set.
diff --git a/pkg/cpuid/cpuid_arm64.go b/pkg/cpuid/cpuid_arm64.go
index 04645aed5..446d3db83 100644
--- a/pkg/cpuid/cpuid_arm64.go
+++ b/pkg/cpuid/cpuid_arm64.go
@@ -491,4 +491,5 @@ func init() {
 	initCPUInfo()
 	initHwCap()
 	initFeaturesFromString()
+	hostFeatureSet = getHostFeatureSet()
 }
diff --git a/pkg/cpuid/cpuid_x86.go b/pkg/cpuid/cpuid_x86.go
index a92d32d74..8cbcc9f61 100644
--- a/pkg/cpuid/cpuid_x86.go
+++ b/pkg/cpuid/cpuid_x86.go
@@ -1109,4 +1109,5 @@ func initFeaturesFromString() {
 func init() {
 	initCPUFreq()
 	initFeaturesFromString()
+	hostFeatureSet = getHostFeatureSet()
 }