Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

3 files changed, 4 insertions, 17 deletions

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index bd86fea49a0c..d3f093820bc7 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1417,7 +1417,7 @@ sys_call_table:
         data8 sys_msgrcv
         data8 sys_msgctl
         data8 sys_shmget
-        data8 ia64_shmat
+        data8 sys_shmat
         data8 sys_shmdt                         // 1115
         data8 sys_shmctl
         data8 sys_syslog
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 8dde0b16d4c8..907464ee7273 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -17,6 +17,7 @@
 #include <linux/user.h>
 #include <linux/security.h>
 #include <linux/audit.h>
+#include <linux/signal.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -1481,7 +1482,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
               case PTRACE_CONT:
                 /* restart after signal. */
                 ret = -EIO;
-                if (data > _NSIG)
+                if (!valid_signal(data))
                         goto out_tsk;
                 if (request == PTRACE_SYSCALL)
                         set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
@@ -1520,7 +1521,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
                 /* let child execute for one instruction */
               case PTRACE_SINGLEBLOCK:
                 ret = -EIO;
-                if (data > _NSIG)
+                if (!valid_signal(data))
                         goto out_tsk;
 
                 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
index 3ac216e1c8bb..a8cf6d8a509c 100644
--- a/arch/ia64/kernel/sys_ia64.c
+++ b/arch/ia64/kernel/sys_ia64.c
@@ -93,20 +93,6 @@ sys_getpagesize (void)
 }
 
 asmlinkage unsigned long
-ia64_shmat (int shmid, void __user *shmaddr, int shmflg)
-{
-        unsigned long raddr;
-        int retval;
-
-        retval = do_shmat(shmid, shmaddr, shmflg, &raddr);
-        if (retval < 0)
-                return retval;
-
-        force_successful_syscall_return();
-        return raddr;
-}
-
-asmlinkage unsigned long
 ia64_brk (unsigned long brk)
 {
         unsigned long rlim, retval, newbrk, oldbrk;