From 4a3213d0169370930ec338b6221ea1fe2c9d24d2 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Sat, 8 Dec 2018 14:29:31 +0000 Subject: [PATCH] m68k: Fix kernel_sigaction definition To: libc-alpha@sourceware.org The commit b4a5d26d8835d972995f0a0a2f805a8845bafa0b "linux: Consolidate sigaction implementation" changed the m68k kernel_sigaction definition to have the field order of the old API which differ from the current API. * sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h: Use default Linux version as base implementation. --- .../unix/sysv/linux/m68k/kernel_sigaction.h | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h b/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h index 54972feb13..94f3e9b082 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h @@ -1,22 +1,8 @@ -#ifndef _KERNEL_SIGACTION_H -# define _KERNEL_SIGACTION_H - -#include - +/* m68k uses the generic Linux UAPI but defines SA_RESTORER. */ #define SA_RESTORER 0x04000000 +#include -/* This is the sigaction structure from the Linux 3.2 kernel. */ -struct kernel_sigaction -{ - __sighandler_t k_sa_handler; - sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer) (void); -}; - -#define SET_SA_RESTORER(kact, act) \ +#define SET_SA_RESTORER(kact, act) \ (kact)->sa_restorer = (act)->sa_restorer -#define RESET_SA_RESTORER(act, kact) \ +#define RESET_SA_RESTORER(act, kact) \ (act)->sa_restorer = (kact)->sa_restorer - -#endif -- 2.19.2