Merge release-20210322.0-29-g8a2f7e716 (automated)

1 files changed, 2 insertions, 2 deletions

diff --git a/pkg/sentry/fs/offset.go b/pkg/sentry/fs/offset.go
index 53b5df175..3a8c97d8f 100644
--- a/pkg/sentry/fs/offset.go
+++ b/pkg/sentry/fs/offset.go
@@ -17,14 +17,14 @@ package fs
 import (
 	"math"
 
-	"gvisor.dev/gvisor/pkg/usermem"
+	"gvisor.dev/gvisor/pkg/hostarch"
 )
 
 // OffsetPageEnd returns the file offset rounded up to the nearest
 // page boundary. OffsetPageEnd panics if rounding up causes overflow,
 // which shouldn't be possible given that offset is an int64.
 func OffsetPageEnd(offset int64) uint64 {
-	end, ok := usermem.Addr(offset).RoundUp()
+	end, ok := hostarch.Addr(offset).RoundUp()
 	if !ok {
 		panic("impossible overflow")
 	}