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

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

x86: signal: cosmetic unification of NR_restart_syscall 



Impact: cleanup

Add #ifdef directive to unify NR_restart_syscall.

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

arch/x86/kernel/signal_32.c

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

}



#ifdef CONFIG_X86_32

#define NR_restart_syscall	__NR_restart_syscall

#else /* !CONFIG_X86_32 */

#define NR_restart_syscall	\

	test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall

#endif /* CONFIG_X86_32 */



/*

 * 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

arch/x86/kernel/signal_64.c

+5 −0
Original line number Diff line number Diff line
@@ -420,8 +420,13 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	return 0;

}



#ifdef CONFIG_X86_32

#define NR_restart_syscall	__NR_restart_syscall

#else /* !CONFIG_X86_32 */

#define NR_restart_syscall	\

	test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall

#endif /* CONFIG_X86_32 */



/*

 * 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