diff options
| author | Andrei Vagin <avagin@google.com> | 2020-03-06 21:12:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 21:12:32 -0800 |
| commit | bf87da89d3c43555fd57e8f1d7aed21b6da78de4 (patch) | |
| tree | 744ba15a2f663d64d56bf1c70bdfe4096f6a1af9 /pkg/sentry/platform/ring0/pagetables | |
| parent | 89957c6c87b5ad5c7bac68f93d9472388db57702 (diff) | |
| parent | ddfc7239be94fa9711df877a66a9718aabff8b96 (diff) | |
Merge branch 'master' into pr_lazy_fpsimd_2
Diffstat (limited to 'pkg/sentry/platform/ring0/pagetables')
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/BUILD | 4 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/pcids.go (renamed from pkg/sentry/platform/ring0/pagetables/pcids_x86.go) | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/sentry/platform/ring0/pagetables/BUILD b/pkg/sentry/platform/ring0/pagetables/BUILD index 971eed7fa..581841555 100644 --- a/pkg/sentry/platform/ring0/pagetables/BUILD +++ b/pkg/sentry/platform/ring0/pagetables/BUILD @@ -7,7 +7,7 @@ go_template( name = "generic_walker", srcs = select_arch( amd64 = ["walker_amd64.go"], - arm64 = ["walker_amd64.go"], + arm64 = ["walker_arm64.go"], ), opt_types = [ "Visitor", @@ -80,7 +80,7 @@ go_library( "pagetables_amd64.go", "pagetables_arm64.go", "pagetables_x86.go", - "pcids_x86.go", + "pcids.go", "walker_amd64.go", "walker_arm64.go", "walker_empty.go", diff --git a/pkg/sentry/platform/ring0/pagetables/pcids_x86.go b/pkg/sentry/platform/ring0/pagetables/pcids.go index e199bae18..9206030bf 100644 --- 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 ( |