[kernel] r8752 - in dists/sid/linux-2.6/debian: . patches/bugfix/hppa patches/series

[Bastian Blank]

Author: waldi
Date: Thu May 24 13:21:01 2007
New Revision: 8752

Log:
[hppa] Fix debugging in lock syscalls.

* debian/changelog: Update.
* debian/patches/bugfix/hppa/kernel-syscall-lws_debug.patch: Add.
* debian/patches/series/3: Update.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/hppa/
   dists/sid/linux-2.6/debian/patches/bugfix/hppa/kernel-syscall-lws_debug.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/3

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu May 24 13:21:01 2007
@@ -89,8 +89,9 @@
   * Make it possible to specifiy special CFLAGS.
   * [hppa] Reenable.
   * [hppa] Workaround hppa64 failure.
+  * [hppa] Fix debugging in lws syscalls.
 
- -- Bastian Blank <waldi at debian.org>  Thu, 24 May 2007 15:08:24 +0200
+ -- Bastian Blank <waldi at debian.org>  Thu, 24 May 2007 15:20:23 +0200
 
 linux-2.6 (2.6.21-2) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/hppa/kernel-syscall-lws_debug.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/hppa/kernel-syscall-lws_debug.patch	Thu May 24 13:21:01 2007
@@ -0,0 +1,58 @@
+tag 425567 + patch
+thanks
+
+Please find below the patch sent to the lkml. Note that even if it is
+workarounded in the glibc, it is important to fix it, as in very rare
+conditions, the kernel could end up in returning always -EDEADLOCK.
+
+diff -u a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
+--- a/arch/parisc/kernel/syscall.S
++++ b/arch/parisc/kernel/syscall.S
+@@ -501,7 +501,7 @@
+ 	shlw	%r20, 4, %r20
+ 	add	%r20, %r28, %r20
+ 
+-# ifdef ENABLE_LWS_DEBUG
++# if ENABLE_LWS_DEBUG
+ 	/*	
+ 		DEBUG, check for deadlock! 
+ 		If the thread register values are the same
+@@ -550,7 +550,7 @@
+ 		perspective
+ 	*/
+ cas_action:
+-#if defined CONFIG_SMP && defined ENABLE_LWS_DEBUG
++#if defined CONFIG_SMP && ENABLE_LWS_DEBUG
+ 	/* DEBUG */
+ 	mfctl	%cr27, %r1
+ 	stw	%r1, 4(%sr2,%r20)
+@@ -562,7 +562,7 @@
+ #ifdef CONFIG_SMP
+ 	/* Free lock */
+ 	stw	%r20, 0(%sr2,%r20)
+-# ifdef ENABLE_LWS_DEBUG
++# if ENABLE_LWS_DEBUG
+ 	/* Clear thread register indicator */
+ 	stw	%r0, 4(%sr2,%r20)
+ # endif
+@@ -576,7 +576,7 @@
+ #ifdef CONFIG_SMP
+ 	/* Free lock */
+ 	stw	%r20, 0(%sr2,%r20)
+-# ifdef ENABLE_LWS_DEBUG
++# if ENABLE_LWS_DEBUG
+ 	stw	%r0, 4(%sr2,%r20)
+ # endif
+ #endif
+
+-- 
+  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
+ : :' :  Debian developer           | Electrical Engineer
+ `. `'   aurel32 at debian.org         | aurelien at aurel32.net
+   `-    people.debian.org/~aurel32 | www.aurel32.net
+
+
+-- 
+To UNSUBSCRIBE, email to debian-kernel-REQUEST at lists.debian.org
+with a subject of "unsubscribe". Trouble? Contact listmaster at lists.debian.org
+

Modified: dists/sid/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/3	(original)
+++ dists/sid/linux-2.6/debian/patches/series/3	Thu May 24 13:21:01 2007
@@ -3,3 +3,4 @@
 + bugfix/2.6.21.2
 - debian/kernelvariables.patch
 + debian/kernelvariables-1.patch
++ bugfix/hppa/kernel-syscall-lws_debug.patch