Merge release-20200810.0-67-g25babd635 (automated)

2 files changed, 1 insertions, 63 deletions

diff --git a/pkg/sentry/platform/file_range.go b/pkg/sentry/platform/file_range.go
deleted file mode 100644
index 685d360e3..000000000
--- a/pkg/sentry/platform/file_range.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package platform
-
-// A Range represents a contiguous range of T.
-//
-// +stateify savable
-type FileRange struct {
-	// Start is the inclusive start of the range.
-	Start uint64
-
-	// End is the exclusive end of the range.
-	End uint64
-}
-
-// WellFormed returns true if r.Start <= r.End. All other methods on a Range
-// require that the Range is well-formed.
-func (r FileRange) WellFormed() bool {
-	return r.Start <= r.End
-}
-
-// Length returns the length of the range.
-func (r FileRange) Length() uint64 {
-	return r.End - r.Start
-}
-
-// Contains returns true if r contains x.
-func (r FileRange) Contains(x uint64) bool {
-	return r.Start <= x && x < r.End
-}
-
-// Overlaps returns true if r and r2 overlap.
-func (r FileRange) Overlaps(r2 FileRange) bool {
-	return r.Start < r2.End && r2.Start < r.End
-}
-
-// IsSupersetOf returns true if r is a superset of r2; that is, the range r2 is
-// contained within r.
-func (r FileRange) IsSupersetOf(r2 FileRange) bool {
-	return r.Start <= r2.Start && r.End >= r2.End
-}
-
-// Intersect returns a range consisting of the intersection between r and r2.
-// If r and r2 do not overlap, Intersect returns a range with unspecified
-// bounds, but for which Length() == 0.
-func (r FileRange) Intersect(r2 FileRange) FileRange {
-	if r.Start < r2.Start {
-		r.Start = r2.Start
-	}
-	if r.End > r2.End {
-		r.End = r2.End
-	}
-	if r.End < r.Start {
-		r.End = r.Start
-	}
-	return r
-}
-
-// CanSplitAt returns true if it is legal to split a segment spanning the range
-// r at x; that is, splitting at x would produce two ranges, both of which have
-// non-zero length.
-func (r FileRange) CanSplitAt(x uint64) bool {
-	return r.Contains(x) && r.Start < x
-}
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eda1e1484..eba2eac30 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,12 +1,12 @@
 package ring0
 
 import (
-	"fmt"
 	"gvisor.dev/gvisor/pkg/sentry/arch"
 	"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
 	"io"
 	"reflect"
 
+	"fmt"
 	"gvisor.dev/gvisor/pkg/usermem"
 )