| Message ID | 87blfen46a.fsf_-_@x220.int.ebiederm.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | signal/parics: Remove parsic specific definition of __ARCH_UAPI_SA_FLAGS | expand |
On 11/30/20 9:30 AM, Eric W. Biederman wrote: > > Randy Dunlap wrote: >> On 11/27/20 10:43 AM, Randy Dunlap wrote: >> >>> on parisc, _SA_SIGGFAULT is undefined and causing build errors. >>> >>> commit 23acdc76f1798b090bb9dcc90671cd29d929834e >>> Author: Peter Collingbourne <pcc@google.com> >>> Date: Thu Nov 12 18:53:34 2020 -0800 >>> >>> signal: clear non-uapi flag bits when passing/returning sa_flags >>> >>> >>> >>> _SA_SIGGFAULT is not used or defined anywhere else in the >>> kernel source tree. >> >> >> Here is the build error (although it should be obvious): >> >> ../kernel/signal.c: In function 'do_sigaction': >> ../arch/parisc/include/asm/signal.h:24:30: error: '_SA_SIGGFAULT' undeclared (first use in this function) >> 24 | #define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT >> | ^~~~~~~~~~~~~ > > Stephen Rothwell pointed out: >> _SA_SIGGFAULT was removed by commit >> >> 41f5a81c07cd ("parisc: Drop HP-UX specific fcntl and signal flags") >> >> which was added to Linus' tree in v5.10-rc1. > > Solve this by removing the the parisc specific definition of > __ARCH_UAPI_SA_FLAGS that was just added. > > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Fixes: 23acdc76f179 ("signal: clear non-uapi flag bits when passing/returning sa_flags") > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Thanks, Eric. Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested BTW, there are 2 typos for "parisc" in the Subject: line... > --- > arch/parisc/include/asm/signal.h | 2 -- > 1 file changed, 2 deletions(-) > > I am applying this trivial fix to my signal-for-v5.11 branch. Catalin > you shouldn't need to do anything unless someone tests your tree on > parisc. > > diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h > index 30dd1e43ef88..715c96ba2ec8 100644 > --- a/arch/parisc/include/asm/signal.h > +++ b/arch/parisc/include/asm/signal.h > @@ -21,8 +21,6 @@ typedef struct { > unsigned long sig[_NSIG_WORDS]; > } sigset_t; > > -#define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT > - > #include <asm/sigcontext.h> > > #endif /* !__ASSEMBLY */ >
Randy Dunlap <rdunlap@infradead.org> writes: > On 11/30/20 9:30 AM, Eric W. Biederman wrote: >> >> Randy Dunlap wrote: >>> On 11/27/20 10:43 AM, Randy Dunlap wrote: >>> >>>> on parisc, _SA_SIGGFAULT is undefined and causing build errors. >>>> >>>> commit 23acdc76f1798b090bb9dcc90671cd29d929834e >>>> Author: Peter Collingbourne <pcc@google.com> >>>> Date: Thu Nov 12 18:53:34 2020 -0800 >>>> >>>> signal: clear non-uapi flag bits when passing/returning sa_flags >>>> >>>> >>>> >>>> _SA_SIGGFAULT is not used or defined anywhere else in the >>>> kernel source tree. >>> >>> >>> Here is the build error (although it should be obvious): >>> >>> ../kernel/signal.c: In function 'do_sigaction': >>> ../arch/parisc/include/asm/signal.h:24:30: error: '_SA_SIGGFAULT' undeclared (first use in this function) >>> 24 | #define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT >>> | ^~~~~~~~~~~~~ >> >> Stephen Rothwell pointed out: >>> _SA_SIGGFAULT was removed by commit >>> >>> 41f5a81c07cd ("parisc: Drop HP-UX specific fcntl and signal flags") >>> >>> which was added to Linus' tree in v5.10-rc1. >> >> Solve this by removing the the parisc specific definition of >> __ARCH_UAPI_SA_FLAGS that was just added. >> >> Reported-by: Randy Dunlap <rdunlap@infradead.org> >> Fixes: 23acdc76f179 ("signal: clear non-uapi flag bits when passing/returning sa_flags") >> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> > > Thanks, Eric. > > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested > > > BTW, there are 2 typos for "parisc" in the Subject: line... Oops. Fixed now. Thank you for testing. Eric > > >> --- >> arch/parisc/include/asm/signal.h | 2 -- >> 1 file changed, 2 deletions(-) >> >> I am applying this trivial fix to my signal-for-v5.11 branch. Catalin >> you shouldn't need to do anything unless someone tests your tree on >> parisc. >> >> diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h >> index 30dd1e43ef88..715c96ba2ec8 100644 >> --- a/arch/parisc/include/asm/signal.h >> +++ b/arch/parisc/include/asm/signal.h >> @@ -21,8 +21,6 @@ typedef struct { >> unsigned long sig[_NSIG_WORDS]; >> } sigset_t; >> >> -#define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT >> - >> #include <asm/sigcontext.h> >> >> #endif /* !__ASSEMBLY */ >>
diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h index 30dd1e43ef88..715c96ba2ec8 100644 --- a/arch/parisc/include/asm/signal.h +++ b/arch/parisc/include/asm/signal.h @@ -21,8 +21,6 @@ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; -#define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT - #include <asm/sigcontext.h> #endif /* !__ASSEMBLY */