Automatic merge of /spare/repo/netdev-2.6 branch smc91x

[~andy/linux] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 7f43d6e62c7a05641e6b54fcbb9ffda74a8ffcbb..f006632c2ba70c4493e1340db7c99bcad7ff38c0 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -25,6 +25,7 @@
 #include <linux/dcookies.h>
 #include <linux/suspend.h>
 #include <linux/tty.h>
+#include <linux/signal.h>
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
@@ -1194,7 +1195,7 @@ static int groups_from_user(struct group_info *group_info,
        return 0;
 }
 
-/* a simple shell-metzner sort */
+/* a simple Shell sort */
 static void groups_sort(struct group_info *group_info)
 {
        int base, max, stride;
@@ -1637,7 +1638,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
        switch (option) {
                case PR_SET_PDEATHSIG:
                        sig = arg2;
-                       if (sig < 0 || sig > _NSIG) {
+                       if (!valid_signal(sig)) {
                                error = -EINVAL;
                                break;
                        }