diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-02-28 18:47:17 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-02-28 18:47:17 -0800 |
commit | 3d9ddeb339ce41f82717643dce92b24f3ae0cf41 (patch) | |
tree | daa05b3b3f8a922322e04acad568194c4a5063fb /pkg/sentry/arch | |
parent | ab7ecdd66d2aa4835bbe655ba672bd30813a2a88 (diff) | |
parent | 413a9b7fdc14f8bff660e1988e3ef0355dd4e6c6 (diff) |
Merge pull request #1929 from avagin:arm64-cpuid
PiperOrigin-RevId: 297982488
Diffstat (limited to 'pkg/sentry/arch')
-rw-r--r-- | pkg/sentry/arch/arch_arm64.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/arch/arch_arm64.go b/pkg/sentry/arch/arch_arm64.go index 372b650b9..885115ae2 100644 --- a/pkg/sentry/arch/arch_arm64.go +++ b/pkg/sentry/arch/arch_arm64.go @@ -53,6 +53,11 @@ const ( preferredPIELoadAddr usermem.Addr = maxAddr64 / 6 * 5 ) +var ( + // CPUIDInstruction doesn't exist on ARM64. + CPUIDInstruction = []byte{} +) + // These constants are selected as heuristics to help make the Platform's // potentially limited address space conform as closely to Linux as possible. const ( |