diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-15 20:02:27 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-15 20:02:27 +0100 |
| commit | 118d375cbcf90c2d9f41fee4adb324a5852dbb30 (patch) | |
| tree | c4e5c100f5dbdc7f48e84f624920d64ad5a1e639 | |
| parent | bd5658eb804efcce034119a0853e60dc6855c97f (diff) | |
| download | patches-118d375cbcf90c2d9f41fee4adb324a5852dbb30.tar.gz | |
fix patch rebase
| -rw-r--r-- | prctl-child_reaper.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/prctl-child_reaper.patch b/prctl-child_reaper.patch index c202bf0..6ab5561 100644 --- a/prctl-child_reaper.patch +++ b/prctl-child_reaper.patch @@ -162,14 +162,14 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> case PR_SET_MM: error = prctl_set_mm(arg2, arg3, arg4, arg5); break; -++ case PR_SET_CHILD_SUBREAPER: -++ me->signal->is_child_subreaper = !!arg2; -++ error = 0; -++ break; -++ case PR_GET_CHILD_SUBREAPER: -++ error = put_user(me->signal->is_child_subreaper, -++ (int __user *) arg2); -++ break; ++ case PR_SET_CHILD_SUBREAPER: ++ me->signal->is_child_subreaper = !!arg2; ++ error = 0; ++ break; ++ case PR_GET_CHILD_SUBREAPER: ++ error = put_user(me->signal->is_child_subreaper, ++ (int __user *) arg2); ++ break; default: error = -EINVAL; break; |