Merge 599136b2 (automated)

This commit is contained in:
gVisor bot 2019-08-29 21:07:02 +00:00
commit 67d3cad83c
3 changed files with 7 additions and 8 deletions

View File

@ -1,12 +1,12 @@
package kernel package kernel
import ( import (
"fmt"
"reflect"
"strings"
"unsafe" "unsafe"
"fmt"
"gvisor.dev/gvisor/third_party/gvsync" "gvisor.dev/gvisor/third_party/gvsync"
"reflect"
"strings"
) )
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race

View File

@ -1,14 +1,13 @@
package ring0 package ring0
import ( import (
"syscall"
"fmt" "fmt"
"gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/cpuid"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/sentry/usermem" "gvisor.dev/gvisor/pkg/sentry/usermem"
"io" "io"
"reflect" "reflect"
"syscall"
) )
var ( var (

View File

@ -1,12 +1,12 @@
package time package time
import ( import (
"fmt"
"reflect"
"strings"
"unsafe" "unsafe"
"fmt"
"gvisor.dev/gvisor/third_party/gvsync" "gvisor.dev/gvisor/third_party/gvsync"
"reflect"
"strings"
) )
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race