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

Commit 69e13ad5 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: signal: remove indent in restore_sigcontext() 



remove braces and indent for flags and fpstate in restore_sigcontext().

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a2e8d3dc

arch/x86/kernel/signal_32.c

+7 −14
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static int 
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,

		   unsigned long *pax)

{

	void __user *buf;

	unsigned int tmpflags;

	unsigned int err = 0;



	/* Always make any pending restarted system calls return -EINTR */
@@ -156,21 +158,12 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
	COPY_SEG_STRICT(cs);

	COPY_SEG_STRICT(ss);



	{

		unsigned int tmpflags;



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

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

						(tmpflags & FIX_EFLAGS);

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

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

	}



	{

		void __user *buf;



	err |= __get_user(buf, &sc->fpstate);

	err |= restore_i387_xstate(buf);

	}



	err |= __get_user(*pax, &sc->ax);

	return err;

arch/x86/kernel/signal_64.c

+7 −12
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ static int 
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,

		   unsigned long *pax)

{

	void __user *buf;

	unsigned int tmpflags;

	unsigned int err = 0;



	/* Always make any pending restarted system calls return -EINTR */
@@ -90,19 +92,12 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
	 * App's signal handler can save/restore other segments if needed. */

	COPY_SEG_STRICT(cs);



	{

		unsigned int tmpflags;

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

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

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

	}



	{

		void __user *buf;



	err |= __get_user(buf, &sc->fpstate);

	err |= restore_i387_xstate(buf);

	}



	err |= __get_user(*pax, &sc->ax);

	return err;