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

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

x86: signal: make NR_restart_syscall 



make NR_restart_syscall macro for cosmetic unification of handle_signal().

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

arch/x86/kernel/signal_32.c

+2 −1
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	return 0;

}



#define NR_restart_syscall	__NR_restart_syscall

/*

 * Note that 'init' is a special process: it doesn't get signals it doesn't

 * want to handle. Thus you cannot kill init even with a SIGKILL even by
@@ -635,7 +636,7 @@ static void do_signal(struct pt_regs *regs) 
			break;



		case -ERESTART_RESTARTBLOCK:

			regs->ax = __NR_restart_syscall;

			regs->ax = NR_restart_syscall;

			regs->ip -= 2;

			break;

		}

arch/x86/kernel/signal_64.c

+3 −3
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	return ret;

}



#define NR_restart_syscall	\

	test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall

/*

 * Note that 'init' is a special process: it doesn't get signals it doesn't

 * want to handle. Thus you cannot kill init even with a SIGKILL even by
@@ -423,9 +425,7 @@ static void do_signal(struct pt_regs *regs) 
			regs->ip -= 2;

			break;

		case -ERESTART_RESTARTBLOCK:

			regs->ax = test_thread_flag(TIF_IA32) ?

					__NR_ia32_restart_syscall :

					__NR_restart_syscall;

			regs->ax = NR_restart_syscall;

			regs->ip -= 2;

			break;

		}