Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a176803 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: Use FIX_EFLAGS define in X86_64 



[ tglx@linutronix.de: simplified ]

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ac66f3fd

arch/x86/kernel/signal_32.c

+11 −5
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ 


#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



#define __FIX_EFLAGS	(X86_EFLAGS_AC | X86_EFLAGS_OF | \

			 X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \

			 X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \

			 X86_EFLAGS_CF)



#ifdef CONFIG_X86_32

# define FIX_EFLAGS	(__FIX_EFLAGS | X86_EFLAGS_RF)

#else

# define FIX_EFLAGS	__FIX_EFLAGS

#endif



/*

 * Atomically swap in the new signal mask, and wait for a signal.

 */
@@ -122,11 +133,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax 
	  err |= __get_user(tmp, &sc->seg);				\

	  loadsegment(seg,tmp); }



#define	FIX_EFLAGS	(X86_EFLAGS_AC | X86_EFLAGS_RF |		 \

			 X86_EFLAGS_OF | X86_EFLAGS_DF |		 \

			 X86_EFLAGS_TF | X86_EFLAGS_SF | X86_EFLAGS_ZF | \

			 X86_EFLAGS_AF | X86_EFLAGS_PF | X86_EFLAGS_CF)



	GET_SEG(gs);

	COPY_SEG(fs);

	COPY_SEG(es);

arch/x86/kernel/signal_64.c

+13 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/stddef.h>

#include <linux/personality.h>

#include <linux/compiler.h>

#include <asm/processor.h>

#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <asm/i387.h>
@@ -30,6 +31,17 @@ 


#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



#define __FIX_EFLAGS	(X86_EFLAGS_AC | X86_EFLAGS_OF | \

			 X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \

			 X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \

			 X86_EFLAGS_CF)



#ifdef CONFIG_X86_32

# define FIX_EFLAGS	(__FIX_EFLAGS | X86_EFLAGS_RF)

#else

# define FIX_EFLAGS	__FIX_EFLAGS

#endif



int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

               sigset_t *set, struct pt_regs * regs); 

int ia32_setup_frame(int sig, struct k_sigaction *ka,
@@ -87,7 +99,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned 
	{

		unsigned int tmpflags;

		err |= __get_user(tmpflags, &sc->flags);

		regs->flags = (regs->flags & ~0x40DD5) | (tmpflags & 0x40DD5);

		regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);

		regs->orig_ax = -1;		/* disable syscall checks */

	}