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

Commit 5702c5ee authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place 



During merging of PR_GET_TID_ADDRESS patch the code has been misplaced (it
happened to appear under PR_MCE_KILL) in result noone can use this option.

Fix it by moving code snippet to a proper place.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Andrey Vagin <avagin@openvz.org>
Cc: Serge Hallyn <serge.hallyn@canonical.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 50d75f8d

kernel/sys.c

+3 −3
Original line number Diff line number Diff line
@@ -2127,9 +2127,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, 
				else

					return -EINVAL;

				break;

		case PR_GET_TID_ADDRESS:

			error = prctl_get_tid_address(me, (int __user **)arg2);

			break;

			default:

				return -EINVAL;

			}
@@ -2147,6 +2144,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, 
		case PR_SET_MM:

			error = prctl_set_mm(arg2, arg3, arg4, arg5);

			break;

		case PR_GET_TID_ADDRESS:

			error = prctl_get_tid_address(me, (int __user **)arg2);

			break;

		case PR_SET_CHILD_SUBREAPER:

			me->signal->is_child_subreaper = !!arg2;

			error = 0;