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

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

x86_32: signal: use syscall_get_nr and error 



Use asm/syscall.h interfaces that do the same things.

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

arch/x86/kernel/signal_32.c

+5 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/uaccess.h>

#include <asm/i387.h>

#include <asm/vdso.h>

#include <asm/syscall.h>

#include <asm/syscalls.h>



#include "sigframe.h"
@@ -507,9 +508,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	int ret;



	/* Are we from a system call? */

	if ((long)regs->orig_ax >= 0) {

	if (syscall_get_nr(current, regs) >= 0) {

		/* If so, check system call restarting.. */

		switch (regs->ax) {

		switch (syscall_get_error(current, regs)) {

		case -ERESTART_RESTARTBLOCK:

		case -ERESTARTNOHAND:

			regs->ax = -EINTR;
@@ -623,9 +624,9 @@ static void do_signal(struct pt_regs *regs) 
	}



	/* Did we come from a system call? */

	if ((long)regs->orig_ax >= 0) {

	if (syscall_get_nr(current, regs) >= 0) {

		/* Restart the system call - no handlers present */

		switch (regs->ax) {

		switch (syscall_get_error(current, regs)) {

		case -ERESTARTNOHAND:

		case -ERESTARTSYS:

		case -ERESTARTNOINTR: