diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-02 19:44:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-02 19:44:17 +0000 |
| commit | 9f9c52c16339bed45e98ed003da7025690aaf3a4 (patch) | |
| tree | e2d0072bd094f9341325bf7179c20a24b1e60c4f /pkg | |
| parent | f259b97e845967859278ea82981882b085fa8636 (diff) | |
| parent | f03e19d575f644aa394cd86a504148404d748f9f (diff) | |
Merge release-20200219.0-79-gf03e19d (automated)
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | pkg/sentry/platform/ring0/pagetables/pcids.go (renamed from pkg/sentry/platform/ring0/pagetables/pcids_x86.go) | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go index c1148613d..52bab66fe 100755 --- a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go +++ b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go @@ -1,6 +1,5 @@ // automatically generated by stateify. // +build i386 amd64 -// +build i386 amd64 package pagetables diff --git a/pkg/sentry/platform/ring0/pagetables/pcids_x86.go b/pkg/sentry/platform/ring0/pagetables/pcids.go index e199bae18..9206030bf 100644..100755 --- a/pkg/sentry/platform/ring0/pagetables/pcids_x86.go +++ b/pkg/sentry/platform/ring0/pagetables/pcids.go @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build i386 amd64 - package pagetables import ( |