From 5c9e84622305dc9fd4e9b81eeb7309b8a894f99e Mon Sep 17 00:00:00 2001 From: Ian Lewis Date: Sun, 13 Jun 2021 19:21:46 -0700 Subject: Remove usermem dependency from marshal Both marshal and usermem are depended on by many packages and a dependency on marshal can often create circular dependencies. marshal should consider adding internal dependencies carefully moving forward. Fixes #6160 PiperOrigin-RevId: 379199882 --- pkg/abi/linux/signal.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkg/abi/linux') diff --git a/pkg/abi/linux/signal.go b/pkg/abi/linux/signal.go index 31d020f77..06a4c6401 100644 --- a/pkg/abi/linux/signal.go +++ b/pkg/abi/linux/signal.go @@ -293,8 +293,6 @@ type Sigevent struct { UnRemainder [44]byte } -// LINT.IfChange - // SigAction represents struct sigaction. // // +marshal @@ -306,8 +304,6 @@ type SigAction struct { Mask SignalSet } -// LINT.ThenChange(../../safecopy/safecopy_unsafe.go) - // SignalStack represents information about a user stack, and is equivalent to // stack_t. // -- cgit v1.2.3