summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-14 20:16:49 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-14 20:16:49 +0000
commit3f7c15f4c967c60b3b6214d0136a4cb496aeaf7f (patch)
treeefdbe6c94600cf0325ecc3550243d751ff0aa4d8 /pkg/sentry/platform
parent43af6825a60fb340835739f85975490d480874b9 (diff)
parentb9db1c03131bbbb76347b4f0266f1eb440dea1ec (diff)
Merge release-20210607.0-42-gb9db1c031 (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/kvm/machine_amd64.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/platform/kvm/machine_amd64.go b/pkg/sentry/platform/kvm/machine_amd64.go
index b8e1cd72c..7c063c7f5 100644
--- a/pkg/sentry/platform/kvm/machine_amd64.go
+++ b/pkg/sentry/platform/kvm/machine_amd64.go
@@ -469,7 +469,7 @@ func availableRegionsForSetMem() (phyRegions []physicalRegion) {
}
func (m *machine) mapUpperHalf(pageTable *pagetables.PageTables) {
- // Map all the executible regions so that all the entry functions
+ // Map all the executable regions so that all the entry functions
// are mapped in the upper half.
applyVirtualRegions(func(vr virtualRegion) {
if excludeVirtualRegion(vr) || vr.filename == "[vsyscall]" {