From: Tony Luck <tony.luck@intel.com>
Date: Fri, 17 Oct 2008 20:51:16 +0000 (-0700)
Subject: Pull utrace into release branch
X-Git-Tag: Ubuntu-5.2.0-15.16~32432^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9224652cc76417bfe779bcdb1243cf0b083e3eee;p=mirror_ubuntu-eoan-kernel.git

Pull utrace into release branch
---

9224652cc76417bfe779bcdb1243cf0b083e3eee
diff --cc arch/ia64/ia32/ia32_entry.S
index 82a7a0bc5d2e,a73ec0089d43..a8cf19958850
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@@ -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 */