diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
| commit | 91dcb2483b56eeb8083cdff90ed8e8f0a1665d13 (patch) | |
| tree | a2752b44b8da8abf49f60cef2a324068503111cb /pkg/sentry/platform/ring0 | |
| parent | 085d6fdce34f34d82de5f71d031407c3da253b23 (diff) | |
| parent | 5b41ba5d0eca266790dba5f5dd095010e3944726 (diff) | |
Merge 5b41ba5d (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 8 | ||||
| -rwxr-xr-x | pkg/sentry/platform/ring0/entry_impl_amd64.s | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index acae012dc..d4bfc5a4a 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,14 +1,14 @@ package ring0 import ( - "fmt" - "gvisor.dev/gvisor/pkg/cpuid" - "io" - "reflect" "syscall" + "fmt" + "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" + "io" + "reflect" ) var ( diff --git a/pkg/sentry/platform/ring0/entry_impl_amd64.s b/pkg/sentry/platform/ring0/entry_impl_amd64.s index d082d06a9..daba45f9d 100755 --- a/pkg/sentry/platform/ring0/entry_impl_amd64.s +++ b/pkg/sentry/platform/ring0/entry_impl_amd64.s @@ -79,7 +79,7 @@ #include "funcdata.h" #include "textflag.h" -// NB: Offsets are programatically generated (see BUILD). +// NB: Offsets are programmatically generated (see BUILD). // // This file is concatenated with the definitions. |