mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-26 22:24:09 +08:00
5c55b40b27
Fix interaction with new generic header stuff as added by:
commit 6103ec56c6
Author: Arnd Bergmann <arnd@arndb.de>
Date: Wed May 13 22:56:27 2009 +0000
asm-generic: add generic ABI headers
The problem is that asm/signal.h has been made to include asm-generic/signal.h,
but the redundant stuff from asm/signal.h has not been discarded, leading to
multiple redefinitions.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
45 lines
891 B
C
45 lines
891 B
C
#ifndef _ASM_SIGNAL_H
|
|
#define _ASM_SIGNAL_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
#ifndef __KERNEL__
|
|
/* Here we must cater to libcs that poke about in kernel headers. */
|
|
|
|
#define NSIG 32
|
|
typedef unsigned long sigset_t;
|
|
|
|
#endif /* !__KERNEL__ */
|
|
|
|
#define SA_RESTORER 0x04000000 /* to get struct sigaction correct */
|
|
|
|
#include <asm-generic/signal.h>
|
|
|
|
#ifdef __KERNEL__
|
|
struct old_sigaction {
|
|
__sighandler_t sa_handler;
|
|
old_sigset_t sa_mask;
|
|
unsigned long sa_flags;
|
|
__sigrestore_t sa_restorer;
|
|
};
|
|
|
|
#else
|
|
/* Here we must cater to libcs that poke about in kernel headers. */
|
|
|
|
struct sigaction {
|
|
union {
|
|
__sighandler_t _sa_handler;
|
|
void (*_sa_sigaction)(int, struct siginfo *, void *);
|
|
} _u;
|
|
sigset_t sa_mask;
|
|
unsigned long sa_flags;
|
|
void (*sa_restorer)(void);
|
|
};
|
|
|
|
#define sa_handler _u._sa_handler
|
|
#define sa_sigaction _u._sa_sigaction
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_SIGNAL_H */
|