• Linus Torvalds's avatar
    Merge branch 'siginfo-si_trapno-for-v5.15' of... · 48983701
    Linus Torvalds authored
    Merge branch 'siginfo-si_trapno-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
    
    Pull siginfo si_trapno updates from Eric Biederman:
     "The full set of si_trapno changes was not appropriate as a fix for the
      newly added SIGTRAP TRAP_PERF, and so I postponed the rest of the
      related cleanups.
    
      This is the rest of the cleanups for si_trapno that reduces it from
      being a really weird arch special case that is expect to be always
      present (but isn't) on the architectures that support it to being yet
      another field in the _sigfault union of struct siginfo.
    
      The changes have been reviewed and marinated in linux-next. With the
      removal of this awkward special case new code (like SIGTRAP TRAP_PERF)
      that works across architectures should be easier to write and
      maintain"
    
    * 'siginfo-si_trapno-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
      signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency
      signal: Verify the alignment and size of siginfo_t
      signal: Remove the generic __ARCH_SI_TRAPNO support
      signal/alpha: si_trapno is only used with SIGFPE and SIGTRAP TRAP_UNK
      signal/sparc: si_trapno is only used with SIGILL ILL_ILLTRP
      arm64: Add compile-time asserts for siginfo_t offsets
      arm: Add compile-time asserts for siginfo_t offsets
      sparc64: Add compile-time asserts for siginfo_t offsets
    48983701
osf_sys.c 32.2 KB