diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-02 11:42:04 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-02 11:42:04 -0800 |
| commit | f03e19d575f644aa394cd86a504148404d748f9f (patch) | |
| tree | eab490e4b26b7fc1608b74561d1faee4bc9e5115 | |
| parent | 42fb7d349137bd8847e7c3df6493fde3bc8e6e89 (diff) | |
| parent | 837cf6255120fe4577a9fd758ecbe2f52f268ba8 (diff) | |
Merge pull request #1885 from avagin:arm64-pcids
PiperOrigin-RevId: 298405064
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/BUILD | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/pagetables/pcids.go (renamed from pkg/sentry/platform/ring0/pagetables/pcids_x86.go) | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/pagetables/BUILD b/pkg/sentry/platform/ring0/pagetables/BUILD index 4f2406ce3..581841555 100644 --- a/pkg/sentry/platform/ring0/pagetables/BUILD +++ b/pkg/sentry/platform/ring0/pagetables/BUILD @@ -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 ( |