diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-09-07 00:33:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-07 00:33:22 +0000 |
| commit | c84161e6acb9a7a04fa0a7eecb15d5143c0283ba (patch) | |
| tree | 2c8dcf6066c231e8bf6ad74dc40e88c85b9c2d60 | |
| parent | f2c95a37af824d9c4502dd99857e73d4d07a4c4d (diff) | |
| parent | 9e1cbdf565a1f5bf5bbc84bad0103fe2289e817c (diff) | |
Merge 9e1cbdf5 (automated)
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 7 | ||||
| -rw-r--r-- | third_party/gvsync/downgradable_rwmutex_unsafe.go | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index 5032ac56e..a36a17e37 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,13 +1,14 @@ package ring0 import ( - "fmt" "gvisor.dev/gvisor/pkg/cpuid" + "reflect" + "syscall" + + "fmt" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" "io" - "reflect" - "syscall" ) var ( diff --git a/third_party/gvsync/downgradable_rwmutex_unsafe.go b/third_party/gvsync/downgradable_rwmutex_unsafe.go index 069939033..1f6007aa1 100644 --- a/third_party/gvsync/downgradable_rwmutex_unsafe.go +++ b/third_party/gvsync/downgradable_rwmutex_unsafe.go @@ -57,9 +57,6 @@ func (rw *DowngradableRWMutex) RLock() { // RUnlock undoes a single RLock call. func (rw *DowngradableRWMutex) RUnlock() { if RaceEnabled { - // TODO(jamieliu): Why does this need to be ReleaseMerge instead of - // Release? IIUC this establishes Unlock happens-before RUnlock, which - // seems unnecessary. RaceReleaseMerge(unsafe.Pointer(&rw.writerSem)) RaceDisable() } |