[kernel] r5555 - in dists/sid/linux-2.6/debian: . patches patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Sun Jan 22 00:17:53 2006
New Revision: 5555

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4
   dists/sid/linux-2.6/debian/patches/sparc64-entry-strace.patch
Log:
* Start 2.6.15-4.
* Add sparc64-entry-strace.patch to fix strace on sparc.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jan 22 00:17:53 2006
@@ -1,3 +1,13 @@
+linux-2.6 (2.6.15-4) UNRELEASED; urgency=low
+  [ Jurij Smakov ]
+  * [sparc64] Add the sparc64-entry-strace.patch to fix the 
+    strace on sparc (it has been broken since 2.6.15). The 
+    patch have not been blessed by upstream yet, but it works
+    for other people and I've tested it myself. (Closes: #339562)
+    Ref: http://marc.theaimsgroup.com/?t=113676826400001&r=1&w=2
+	
+ -- Jurij Smakov <jurij at wooyd.org>  Sat, 21 Jan 2006 16:14:33 -0800
+	
 linux-2.6 (2.6.15-3) unstable; urgency=low
 
   [ Martin Michlmayr ]

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Sun Jan 22 00:17:53 2006
@@ -1 +1,2 @@
 + m68k-vmeints.patch
++ sparc64-entry-strace.patch

Modified: dists/sid/linux-2.6/debian/patches/sparc64-entry-strace.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/sparc64-entry-strace.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/sparc64-entry-strace.patch	Sun Jan 22 00:17:53 2006
@@ -1,23 +1,18 @@
-# In http://marc.theaimsgroup.com/?l=linux-sparc&m=113678944402745&w=2
-# David Miller wrote:
-#
-# We're spamming the existing flags value in register %l0, thus
-# corrupting the subsequent tracing flag et al. checks.
-#
-# This should fix it:
-#
-# diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
-# index 11a8484..86ff6a9 100644
---- a/arch/sparc64/kernel/entry.S
-+++ b/arch/sparc64/kernel/entry.S
-@@ -1657,8 +1657,8 @@ ret_sys_call:
+--- a/arch/sparc64/kernel/entry.S	2006-01-02 19:21:10.000000000 -0800
++++ b/arch/sparc64/kernel/entry.S	2006-01-11 21:56:52.000000000 -0800
+@@ -1657,13 +1657,10 @@
  	/* Check if force_successful_syscall_return()
  	 * was invoked.
  	 */
 -	ldub		[%curptr + TI_SYS_NOERROR], %l0
 -	brz,pt		%l0, 1f
-+	ldub		[%curptr + TI_SYS_NOERROR], %l1
-+	brz,pt		%l1, 1f
- 	 nop
- 	ba,pt		%xcc, 80f
+-	 nop
+-	ba,pt		%xcc, 80f
++	ldub		[%curptr + TI_SYS_NOERROR], %l2
++	brnz,a,pn	%l2, 80f
  	 stb		%g0, [%curptr + TI_SYS_NOERROR]
+ 
+-1:
+ 	cmp		%o0, -ERESTART_RESTARTBLOCK
+ 	bgeu,pn		%xcc, 1f
+ 	 andcc		%l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6