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

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

x86: reduce trivial style differences in signal_32|64.c 



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 c3e6ff87

arch/x86/kernel/signal_32.c

+30 −34
Original line number Diff line number Diff line
@@ -131,14 +131,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax 
	COPY_SEG(fs);

	COPY_SEG(es);

	COPY_SEG(ds);

	COPY(di);

	COPY(si);

	COPY(bp);

	COPY(sp);

	COPY(bx);

	COPY(dx);

	COPY(cx);

	COPY(ip);

	COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);

	COPY(dx); COPY(cx); COPY(ip);

	COPY_SEG_STRICT(cs);

	COPY_SEG_STRICT(ss);
@@ -412,7 +406,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
		ptrace_notify(SIGTRAP);



#if DEBUG_SIG

	printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",

	printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",

		current->comm, current->pid, frame, regs->ip, frame->pretcode);

#endif
@@ -544,6 +538,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
		case -ERESTARTNOINTR:

			regs->ax = regs->orig_ax;

			regs->ip -= 2;

			break;

		}

	}
@@ -580,18 +575,17 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
 */

static void do_signal(struct pt_regs *regs)

{

	struct k_sigaction ka;

	siginfo_t info;

	int signr;

	struct k_sigaction ka;

	sigset_t *oldset;



	/*

	 * We want the common case to go fast, which

	 * is why we may in certain cases get here from

	 * kernel mode. Just return without doing anything

 	 * if so.  vm86 regs switched out by assembly code

 	 * before reaching here, so testing against kernel

 	 * CS suffices.

	 * We want the common case to go fast, which is why we may in certain

	 * cases get here from kernel mode. Just return without doing anything

	 * if so.

	 * X86_32: vm86 regs switched out by assembly code before reaching

	 * here, so testing against kernel CS suffices.

	 */

	if (!user_mode(regs))

		return;
@@ -608,7 +602,7 @@ static void do_signal(struct pt_regs *regs) 
		 * have been cleared if the watchpoint triggered

		 * inside the kernel.

		 */

		if (unlikely(current->thread.debugreg7))

		if (current->thread.debugreg7)

			set_debugreg(current->thread.debugreg7, 7);



		/* Whee!  Actually deliver the signal.  */
@@ -642,8 +636,10 @@ static void do_signal(struct pt_regs *regs) 
		}

	}



	/* if there's no signal to deliver, we just put the saved sigmask

	 * back */

	/*

	 * If there's no signal to deliver, we just put the saved sigmask

	 * back.

	 */

	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {

		clear_thread_flag(TIF_RESTORE_SIGMASK);

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
@@ -654,12 +650,12 @@ static void do_signal(struct pt_regs *regs) 
 * notification of userspace execution resumption

 * - triggered by the TIF_WORK_MASK flags

 */

void do_notify_resume(struct pt_regs *regs, void *_unused,

void do_notify_resume(struct pt_regs *regs, void *unused,

		      __u32 thread_info_flags)

{

	/* Pending single-step? */

	if (thread_info_flags & _TIF_SINGLESTEP) {

		regs->flags |= TF_MASK;

		regs->flags |= X86_EFLAGS_TF;

		clear_thread_flag(TIF_SINGLESTEP);

	}

arch/x86/kernel/signal_64.c

+25 −22
Original line number Diff line number Diff line
@@ -420,10 +420,11 @@ static void do_signal(struct pt_regs *regs) 
	sigset_t *oldset;



	/*

	 * We want the common case to go fast, which

	 * is why we may in certain cases get here from

	 * kernel mode. Just return without doing anything

	 * We want the common case to go fast, which is why we may in certain

	 * cases get here from kernel mode. Just return without doing anything

	 * if so.

	 * X86_32: vm86 regs switched out by assembly code before reaching

	 * here, so testing against kernel CS suffices.

	 */

	if (!user_mode(regs))

		return;
@@ -473,16 +474,18 @@ static void do_signal(struct pt_regs *regs) 
		}

	}



	/* if there's no signal to deliver, we just put the saved sigmask

	   back. */

	/*

	 * If there's no signal to deliver, we just put the saved sigmask

	 * back.

	 */

	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {

		clear_thread_flag(TIF_RESTORE_SIGMASK);

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

	}

}



void

do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)

void do_notify_resume(struct pt_regs *regs, void *unused,

		      __u32 thread_info_flags)

{

#ifdef DEBUG_SIG

	printk("do_notify_resume flags:%x ip:%lx sp:%lx caller:%p pending:%x\n",