Hi Al,
Today's linux-next merge of the signal tree got conflicts in
arch/alpha/include/asm/signal.h, arch/x86/include/asm/signal.h and
arch/cris/include/asm/signal.h between commits 96433f6ee490 ("UAPI:
(Scripted) Disintegrate arch/alpha/include/asm"), af170c5061dd ("UAPI:
(Scripted) Disintegrate arch/x86/include/asm") from Linus' tree, commit
e717abac8a9f ("UAPI: (Scripted) Disintegrate arch/cris/include/asm") from
the cris treeand commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE
definitions") from the signal tree.I fixed it up (the former moved the sections of the files modified by the latter to other files, so I just removed those sections and then applied the following patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell <[email protected]> Date: Thu, 20 Dec 2012 12:24:24 +1100 Subject: [PATCH] fix up for unify SS_ONSTACK/SS_DISABLE definitions Signed-off-by: Stephen Rothwell <[email protected]> --- arch/alpha/include/uapi/asm/signal.h | 6 ------ arch/cris/include/uapi/asm/signal.h | 6 ------ arch/x86/include/uapi/asm/signal.h | 6 ------ 3 files changed, 18 deletions(-) diff --git a/arch/alpha/include/uapi/asm/signal.h b/arch/alpha/include/uapi/asm/signal.h index 965bbfa..dd4ca4b 100644 --- a/arch/alpha/include/uapi/asm/signal.h +++ b/arch/alpha/include/uapi/asm/signal.h @@ -84,12 +84,6 @@ typedef unsigned long sigset_t; #define SA_ONESHOT SA_RESETHAND #define SA_NOMASK SA_NODEFER -/* - * sigaltstack controls - */ -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - #define MINSIGSTKSZ 4096 #define SIGSTKSZ 16384 diff --git a/arch/cris/include/uapi/asm/signal.h b/arch/cris/include/uapi/asm/signal.h index 2162494..ce42fa7 100644 --- a/arch/cris/include/uapi/asm/signal.h +++ b/arch/cris/include/uapi/asm/signal.h @@ -83,12 +83,6 @@ typedef unsigned long sigset_t; #define SA_RESTORER 0x04000000 -/* - * sigaltstack controls - */ -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h index 0818f9a..aa7d6ae 100644 --- a/arch/x86/include/uapi/asm/signal.h +++ b/arch/x86/include/uapi/asm/signal.h @@ -87,12 +87,6 @@ typedef unsigned long sigset_t; #define SA_RESTORER 0x04000000 -/* - * sigaltstack controls - */ -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell [email protected]
pgpZBLjmeKELg.pgp
Description: PGP signature
