SOURCES: kernel-desktop-preempt-rt.patch - ppc smp fixed

sparky sparky at pld-linux.org
Sat Nov 18 19:51:17 CET 2006


Author: sparky                       Date: Sat Nov 18 18:51:17 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- ppc smp fixed

---- Files affected:
SOURCES:
   kernel-desktop-preempt-rt.patch (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.22 SOURCES/kernel-desktop-preempt-rt.patch:1.23
--- SOURCES/kernel-desktop-preempt-rt.patch:1.22	Sat Nov 18 16:06:37 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Sat Nov 18 19:51:12 2006
@@ -53307,19 +53307,54 @@
  			   substream->pcm->device,
 --- linux-2.6.18/include/asm-powerpc/spinlock.h~	2006-11-14 23:42:09.000000000 +0000
 +++ linux-2.6.18/include/asm-powerpc/spinlock.h	2006-11-14 23:23:28.000000000 +0000
-@@ -179,6 +179,7 @@
+@@ -179,7 +179,7 @@
   * This returns the old value in the lock + 1,
   * so we got a read lock if the return value is > 0.
   */
-+#if 0
- static long __inline__ __read_trylock(__raw_rwlock_t *rw)
+-static long __inline__ __read_trylock(__raw_rwlock_t *rw)
++static long __inline__ __ppc__read_trylock(__raw_rwlock_t *rw)
  {
  	long tmp;
-@@ -260,6 +261,7 @@
+ 
+@@ -203,7 +203,7 @@
+  * This returns the old value in the lock,
+  * so we got the write lock if the return value is 0.
+  */
+-static __inline__ long __write_trylock(__raw_rwlock_t *rw)
++static __inline__ long __ppc__write_trylock(__raw_rwlock_t *rw)
+ {
+ 	long tmp, token;
+ 
+@@ -226,7 +226,7 @@
+ static void __inline__ __raw_read_lock(__raw_rwlock_t *rw)
+ {
+ 	while (1) {
+-		if (likely(__read_trylock(rw) > 0))
++		if (likely(__ppc__read_trylock(rw) > 0))
+ 			break;
+ 		do {
+ 			HMT_low();
+@@ -240,7 +240,7 @@
+ static void __inline__ __raw_write_lock(__raw_rwlock_t *rw)
  {
- 	return __write_trylock(rw) == 0;
+ 	while (1) {
+-		if (likely(__write_trylock(rw) == 0))
++		if (likely(__ppc__write_trylock(rw) == 0))
+ 			break;
+ 		do {
+ 			HMT_low();
+@@ -253,12 +253,12 @@
+ 
+ static int __inline__ __raw_read_trylock(__raw_rwlock_t *rw)
+ {
+-	return __read_trylock(rw) > 0;
++	return __ppc__read_trylock(rw) > 0;
  }
-+#endif
  
- static void __inline__ __raw_read_unlock(__raw_rwlock_t *rw)
+ static int __inline__ __raw_write_trylock(__raw_rwlock_t *rw)
  {
+-	return __write_trylock(rw) == 0;
++	return __ppc__write_trylock(rw) == 0;
+ }
+ 
+ static void __inline__ __raw_read_unlock(__raw_rwlock_t *rw)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-preempt-rt.patch?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list