From 03446e6a1849432b06d950fadf28590b400763a1 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Tue, 6 Sep 2005 15:17:37 -0700 Subject: [PATCH] --- yaml --- r: 7389 b: refs/heads/master c: 0730ded5be28653675ed314fdd878b8db5f88aa4 h: refs/heads/master i: 7387: 722803f72e40dad07377638499cf81645f70427d v: v3 --- [refs] | 2 +- trunk/kernel/sys.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 388151bcf235..3aad6afea907 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5acd57936c3224fd86e838201e528e0169373e9b +refs/heads/master: 0730ded5be28653675ed314fdd878b8db5f88aa4 diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c index 0bcaed6560ac..c80412be2302 100644 --- a/trunk/kernel/sys.c +++ b/trunk/kernel/sys.c @@ -1711,7 +1711,6 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { long error; - int sig; error = security_task_prctl(option, arg2, arg3, arg4, arg5); if (error) @@ -1719,12 +1718,11 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, switch (option) { case PR_SET_PDEATHSIG: - sig = arg2; - if (!valid_signal(sig)) { + if (!valid_signal(arg2)) { error = -EINVAL; break; } - current->pdeath_signal = sig; + current->pdeath_signal = arg2; break; case PR_GET_PDEATHSIG: error = put_user(current->pdeath_signal, (int __user *)arg2);