summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/arch
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-29 02:49:39 +0000
committergVisor bot <gvisor-bot@google.com>2020-02-29 02:49:39 +0000
commit358268b7d747bb80f468a795679370c4fb33d190 (patch)
treec14f3e15f6bcef00b59292d5478197ec0c903d3f /pkg/sentry/arch
parentd5dd4fcec6617b52c8311ce8c5ae2efc7d308d53 (diff)
parent3d9ddeb339ce41f82717643dce92b24f3ae0cf41 (diff)
Merge release-20200219.0-75-g3d9ddeb (automated)
Diffstat (limited to 'pkg/sentry/arch')
-rwxr-xr-xpkg/sentry/arch/arch_arm64.go5
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 100755
--- 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 (