diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-05 03:10:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-05 03:10:35 +0000 |
| commit | 84ffd9bfe74f39dfacd655b511cd336ba08e2f21 (patch) | |
| tree | 24f30a13729159447ddf49e5f2be20d489735765 /pkg/sentry | |
| parent | 5dc7ccb99bcf8721bffc1f806b7c4c6a66b51416 (diff) | |
| parent | 8a45c8161601e62faa0d448ff6d5bc0604ea406f (diff) | |
Merge release-20201130.0-44-g8a45c8161 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 12 | ||||
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 12 |
2 files changed, 0 insertions, 24 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index 90148bbb2..4ad42efdf 100644 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,9 +1,6 @@ package kernel import ( - "fmt" - "reflect" - "strings" "unsafe" "gvisor.dev/gvisor/pkg/sync" @@ -38,12 +35,3 @@ func SeqAtomicTryLoadTaskGoroutineSchedInfo(seq *sync.SeqCount, epoch sync.SeqCo ok = seq.ReadOk(epoch) return } - -func initTaskGoroutineSchedInfo() { - var val TaskGoroutineSchedInfo - typ := reflect.TypeOf(val) - name := typ.Name() - if ptrs := sync.PointersInType(typ, name); len(ptrs) != 0 { - panic(fmt.Sprintf("SeqAtomicLoad<%s> is invalid since values %s of type %s contain pointers:\n%s", typ, name, typ, strings.Join(ptrs, "\n"))) - } -} diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index 2cb001080..e57055fc7 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,9 +1,6 @@ package time import ( - "fmt" - "reflect" - "strings" "unsafe" "gvisor.dev/gvisor/pkg/sync" @@ -38,12 +35,3 @@ func SeqAtomicTryLoadParameters(seq *sync.SeqCount, epoch sync.SeqCountEpoch, pt ok = seq.ReadOk(epoch) return } - -func initParameters() { - var val Parameters - typ := reflect.TypeOf(val) - name := typ.Name() - if ptrs := sync.PointersInType(typ, name); len(ptrs) != 0 { - panic(fmt.Sprintf("SeqAtomicLoad<%s> is invalid since values %s of type %s contain pointers:\n%s", typ, name, typ, strings.Join(ptrs, "\n"))) - } -} |