mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2025-03-15 04:57:56 +00:00
Merge pull request #914 from marquiz/fixes/cpuid-ppc
cpu: ignore unknown cpuid flags on non-x86
This commit is contained in:
commit
4d153ae0c3
4 changed files with 12 additions and 12 deletions
|
@ -98,8 +98,8 @@ func getCpuidFlags() []string {
|
||||||
hwcap := uint64(C.gethwcap())
|
hwcap := uint64(C.gethwcap())
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flagNames_arm[key]
|
val, ok := flagNames_arm[key]
|
||||||
if hwcap&key != 0 {
|
if hwcap&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,15 +185,15 @@ func getCpuidFlags() []string {
|
||||||
hwcap2 := uint64(C.gethwcap2())
|
hwcap2 := uint64(C.gethwcap2())
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flagNames_arm64[key]
|
val, ok := flagNames_arm64[key]
|
||||||
if hwcap&key != 0 {
|
if hwcap&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flag2Names_arm64[key]
|
val, ok := flag2Names_arm64[key]
|
||||||
if hwcap2&key != 0 {
|
if hwcap2&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,15 +139,15 @@ func getCpuidFlags() []string {
|
||||||
hwcap2 := uint64(C.gethwcap2())
|
hwcap2 := uint64(C.gethwcap2())
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flagNames_ppc64le[key]
|
val, ok := flagNames_ppc64le[key]
|
||||||
if hwcap&key != 0 {
|
if hwcap&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flag2Names_ppc64le[key]
|
val, ok := flag2Names_ppc64le[key]
|
||||||
if hwcap2&key != 0 {
|
if hwcap2&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,8 +88,8 @@ func getCpuidFlags() []string {
|
||||||
hwcap := uint64(C.gethwcap())
|
hwcap := uint64(C.gethwcap())
|
||||||
for i := uint(0); i < 64; i++ {
|
for i := uint(0); i < 64; i++ {
|
||||||
key := uint64(1 << i)
|
key := uint64(1 << i)
|
||||||
val := flagNames_s390x[key]
|
val, ok := flagNames_s390x[key]
|
||||||
if hwcap&key != 0 {
|
if hwcap&key != 0 && ok {
|
||||||
r = append(r, val)
|
r = append(r, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue