]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Pull utrace into release branch
authorTony Luck <tony.luck@intel.com>
Fri, 17 Oct 2008 20:51:16 +0000 (13:51 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 17 Oct 2008 20:51:16 +0000 (13:51 -0700)
1  2 
arch/ia64/Kconfig
arch/ia64/ia32/ia32_entry.S
arch/ia64/ia32/sys_ia32.c

Simple merge
index 82a7a0bc5d2ea7267873d140887080c6dfcab679,a73ec0089d431845e04fd252106cedbb0d568d1c..a8cf199588508e23c0d6e40e869b8540a37d965a
@@@ -199,10 -204,10 +204,10 @@@ ia32_syscall_table
        data8 sys_setuid        /* 16-bit version */
        data8 sys_getuid        /* 16-bit version */
        data8 compat_sys_stime    /* 25 */
-       data8 sys32_ptrace
+       data8 compat_sys_ptrace
        data8 sys32_alarm
        data8 sys_ni_syscall
 -      data8 sys32_pause
 +      data8 sys_pause
        data8 compat_sys_utime    /* 30 */
        data8 sys_ni_syscall      /* old stty syscall holder */
        data8 sys_ni_syscall      /* old gtty syscall holder */
Simple merge