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

[Kyle McMartin]

Author: kyle
Date: Wed May 24 16:37:35 2006
New Revision: 6685

Added:
   dists/sid/linux-2.6/debian/patches/hppa-rw-can-lock.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/15-extra

Log:
Fix build of 2.6.16 kernel on hppa. kernel/ptrace.c needs 
__raw_(read|write)_can_lock which we weren't providing. Patch pulled from a
commit I made to cvs.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed May 24 16:37:35 2006
@@ -15,6 +15,10 @@
   * [mipsel] Handle memory-mapped chips RTC properly.
   * [arm] Allow RiscPC machines to boot an initrd (tagged list fix).
 
+  [ Kyle McMartin ]
+  * [hppa] Pulled patch from cvs to fix build of kernel/ptrace.c which needs
+    {read,write}_can_lock.
+
  -- maximilian attems <maks at sternwelten.at>  Wed, 24 May 2006 11:29:16 +0200
 
 linux-2.6 (2.6.16-14) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/hppa-rw-can-lock.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/hppa-rw-can-lock.patch	Wed May 24 16:37:35 2006
@@ -0,0 +1,32 @@
+# Upstream status: Already there, needed to fix build of kernel/ptrace.c
+# Author: Kyle McMartin <kyle at debian.org>, poached from my commit to cvs
+
+--- a/include/asm-parisc/spinlock.h	20 Oct 2005 16:07:04 -0000	1.17
++++ b/include/asm-parisc/spinlock.h	25 Mar 2006 04:22:02 -0000	1.18
+@@ -134,14 +134,22 @@ static  __inline__ int __raw_write_trylo
+ 	return 1;
+ }
+ 
+-static __inline__ int __raw_is_read_locked(raw_rwlock_t *rw)
++/*
++ * read_can_lock - would read_trylock() succeed?
++ * @lock: the rwlock in question.
++ */
++static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw)
+ {
+-	return rw->counter > 0;
++	return rw->counter >= 0;
+ }
+ 
+-static __inline__ int __raw_is_write_locked(raw_rwlock_t *rw)
++/*
++ * write_can_lock - would write_trylock() succeed?
++ * @lock: the rwlock in question.
++ */
++static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
+ {
+-	return rw->counter < 0;
++	return !rw->counter;
+ }
+ 
+ #endif /* __ASM_SPINLOCK_H */

Modified: dists/sid/linux-2.6/debian/patches/series/15-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/15-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/15-extra	Wed May 24 16:37:35 2006
@@ -3,3 +3,4 @@
 + mips-dec-serial.patch mipsel
 + mips-dec-scsi.patch mipsel
 + mips-dec-rtc.patch mipsel
++ hppa-rw-can-lock.patch hppa