SOURCES: kernel-desktop-preempt-rt.patch - builds on ppc up again, ...

sparky sparky at pld-linux.org
Sat Nov 18 16:06:43 CET 2006


Author: sparky                       Date: Sat Nov 18 15:06:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- builds on ppc up again, work in progress no smp

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

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.21 SOURCES/kernel-desktop-preempt-rt.patch:1.22
--- SOURCES/kernel-desktop-preempt-rt.patch:1.21	Sat Nov 18 03:45:59 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Sat Nov 18 16:06:37 2006
@@ -9351,19 +9351,6 @@
  static unsigned int timebase_upper = 0, timebase_lower = 0;
  
  void __devinit smp_chrp_give_timebase(void)
-Index: linux/arch/powerpc/platforms/chrp/time.c
-===================================================================
---- linux.orig/arch/powerpc/platforms/chrp/time.c
-+++ linux/arch/powerpc/platforms/chrp/time.c
-@@ -27,7 +27,7 @@
- #include <asm/sections.h>
- #include <asm/time.h>
- 
--extern spinlock_t rtc_lock;
-+extern raw_spinlock_t rtc_lock;
- 
- static int nvram_as1 = NVRAM_AS1;
- static int nvram_as0 = NVRAM_AS0;
 Index: linux/arch/powerpc/platforms/iseries/setup.c
 ===================================================================
 --- linux.orig/arch/powerpc/platforms/iseries/setup.c
@@ -53318,14 +53305,21 @@
  		snd_printd(KERN_DEBUG "XRUN: pcmC%dD%d%c\n",
  			   substream->pcm->card->number,
  			   substream->pcm->device,
---- linux-2.6.18/include/linux/mc146818rtc.h~	2006-09-20 03:42:06.000000000 +0000
-+++ linux-2.6.18/include/linux/mc146818rtc.h	2006-11-07 00:28:19.000000000 +0000
-@@ -17,7 +17,7 @@
- 
- #ifdef __KERNEL__
- #include <linux/spinlock.h>		/* spinlock_t */
--extern spinlock_t rtc_lock;		/* serialize CMOS RAM access */
-+extern spinlock_t rtc_lock __cacheline_aligned_in_smp;		/* serialize CMOS RAM access */
- #endif
+--- 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 @@
+  * 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)
+ {
+ 	long tmp;
+@@ -260,6 +261,7 @@
+ {
+ 	return __write_trylock(rw) == 0;
+ }
++#endif
  
- /**********************************************************************
+ 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.21&r2=1.22&f=u



More information about the pld-cvs-commit mailing list