Merge pull request #6776 from milantracy:arm64

PiperOrigin-RevId: 405451989
This commit is contained in:
gVisor bot
2021-10-25 11:40:34 -07:00
3 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -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.
+1
View File
@@ -491,4 +491,5 @@ func init() {
initCPUInfo()
initHwCap()
initFeaturesFromString()
hostFeatureSet = getHostFeatureSet()
}
+1
View File
@@ -1109,4 +1109,5 @@ func initFeaturesFromString() {
func init() {
initCPUFreq()
initFeaturesFromString()
hostFeatureSet = getHostFeatureSet()
}