diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 15:00:22 +0000 | 
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 15:00:22 +0000 | 
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/sparc/include/asm/signal.h | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
| download | olio-linux-3.10-4de3a8e101150feaefa1139611a50ff37467f33e.tar.xz olio-linux-3.10-4de3a8e101150feaefa1139611a50ff37467f33e.zip  | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/sparc/include/asm/signal.h')
| -rw-r--r-- | arch/sparc/include/asm/signal.h | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h index e49b828a247..aa42fe30d5b 100644 --- a/arch/sparc/include/asm/signal.h +++ b/arch/sparc/include/asm/signal.h @@ -143,10 +143,11 @@ struct sigstack {  #define SA_ONSTACK	_SV_SSTACK  #define SA_RESTART	_SV_INTR  #define SA_ONESHOT	_SV_RESET -#define SA_NOMASK	0x20u +#define SA_NODEFER	0x20u  #define SA_NOCLDWAIT    0x100u  #define SA_SIGINFO      0x200u +#define SA_NOMASK	SA_NODEFER  #define SIG_BLOCK          0x01	/* for blocking signals */  #define SIG_UNBLOCK        0x02	/* for unblocking signals */  |