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

Commit 86d3237c authored Sep 23, 2008 by Hiroshi Shimamoto Committed by Ingo Molnar Sep 24, 2008

x86: signal: cosmetic unification of handle_signal()



Make handle_signal() same.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent ee847c54

arch/x86/kernel/signal_32.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -550,6 +550,15 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
	if (ret)		if (ret)
	return ret;		return ret;

			#ifdef CONFIG_X86_64
			/*
			* This has nothing to do with segment registers,
			* despite the name. This magic affects uaccess.h
			* macros' behavior. Reset it to the normal setting.
			*/
			set_fs(USER_DS);
			#endif

	/*		/*
	* Clear the direction flag as per the ABI for function entry.		* Clear the direction flag as per the ABI for function entry.
	*/		*/

arch/x86/kernel/signal_64.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -346,12 +346,14 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
	if (ret)		if (ret)
	return ret;		return ret;

			#ifdef CONFIG_X86_64
	/*		/*
	* This has nothing to do with segment registers,		* This has nothing to do with segment registers,
	* despite the name. This magic affects uaccess.h		* despite the name. This magic affects uaccess.h
	* macros' behavior. Reset it to the normal setting.		* macros' behavior. Reset it to the normal setting.
	*/		*/
	set_fs(USER_DS);		set_fs(USER_DS);
			#endif

	/*		/*
	* Clear the direction flag as per the ABI for function entry.		* Clear the direction flag as per the ABI for function entry.