diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-04-10 18:24:19 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-04-10 18:24:19 +0000 |
commit | 7ddb3316872d5dec6622901bf0f89c3f8cf5cbca (patch) | |
tree | d50ef762688f59d33826182e531eb14c8d61ec25 /pkg | |
parent | 5cd18de229df7e6926434af049e64db9f475bd05 (diff) | |
parent | 1798d6cbee3360b09d3736069e15fd746e863bd2 (diff) |
Merge release-20200323.0-122-g1798d6c (automated)
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/sentry/kernel/syscalls.go | 3 | ||||
-rw-r--r-- | pkg/sentry/strace/strace.go | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/pkg/sentry/kernel/syscalls.go b/pkg/sentry/kernel/syscalls.go index c9a2321b8..2e3565747 100644 --- a/pkg/sentry/kernel/syscalls.go +++ b/pkg/sentry/kernel/syscalls.go @@ -209,9 +209,6 @@ type Stracer interface { // SyscallEnter is called on syscall entry. // // The returned private data is passed to SyscallExit. - // - // TODO(gvisor.dev/issue/155): remove kernel imports from the strace - // package so that the type can be used directly. SyscallEnter(t *Task, sysno uintptr, args arch.SyscallArguments, flags uint32) interface{} // SyscallExit is called on syscall exit. diff --git a/pkg/sentry/strace/strace.go b/pkg/sentry/strace/strace.go index 77655558e..b94c4fbf5 100644 --- a/pkg/sentry/strace/strace.go +++ b/pkg/sentry/strace/strace.go @@ -778,9 +778,6 @@ func (s SyscallMap) Name(sysno uintptr) string { // // N.B. This is not in an init function because we can't be sure all syscall // tables are registered with the kernel when init runs. -// -// TODO(gvisor.dev/issue/155): remove kernel package dependencies from this -// package and have the kernel package self-initialize all syscall tables. func Initialize() { for _, table := range kernel.SyscallTables() { // Is this known? |