summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/signal.c')
-rw-r--r--arch/arm/kernel/signal.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 0cba3dd07..59e802a6c 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -4,7 +4,7 @@
* Copyright (C) 1995, 1996 Russell King
*/
-#include <linux/config.h> /* for CONFIG_CPU_ARM6 and CONFIG_CPU_SA110 */
+#include <linux/config.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
@@ -37,7 +37,6 @@ extern int ptrace_set_bpt (struct task_struct *);
*/
asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask, struct pt_regs *regs)
{
-
sigset_t saveset;
mask &= _BLOCKABLE;
@@ -154,7 +153,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
__get_user(regs->ARM_sp, &sc->arm_sp);
__get_user(regs->ARM_lr, &sc->arm_lr);
__get_user(regs->ARM_pc, &sc->arm_pc); /* security! */
-#if defined(CONFIG_CPU_ARM6) || defined(CONFIG_CPU_SA110)
+#ifdef CONFIG_CPU_32
__get_user(regs->ARM_cpsr, &sc->arm_cpsr); /* security! */
#endif
@@ -238,7 +237,7 @@ setup_sigcontext(struct sigcontext *sc, /*struct _fpstate *fpstate,*/
__put_user (regs->ARM_sp, &sc->arm_sp);
__put_user (regs->ARM_lr, &sc->arm_lr);
__put_user (regs->ARM_pc, &sc->arm_pc); /* security! */
-#if defined(CONFIG_CPU_ARM6) || defined(CONFIG_CPU_SA110)
+#ifdef CONFIG_CPU_32
__put_user (regs->ARM_cpsr, &sc->arm_cpsr); /* security! */
#endif