[parisc-linux-cvs] linux-2.6 varenet

[Thibaut VARENE]

Le 1 juil. 04, à 22:24, Thibaut Varene a écrit :

> CVSROOT:	/var/cvs
> Module name:	linux-2.6
> Changes by:	varenet	04/07/01 14:24:38
>
> Modified files:
> 	arch/parisc/lib: debuglocks.c
> 	include/asm-parisc: pgtable.h
>
> Log message:
> fixed wrong type in pgtable.h
> bugfix in debuglocks.c


diff -Nru linux-2.6.orig/arch/parisc/lib/debuglocks.c 
linux-2.6/arch/parisc/lib/debuglocks.c
--- linux-2.6.orig/arch/parisc/lib/debuglocks.c 2004-07-01 
21:40:12.000000000 +0200
+++ linux-2.6/arch/parisc/lib/debuglocks.c      2004-07-01 
21:39:40.000000000 +0200
@@ -46,7 +46,7 @@ try_again:
         /* Do the actual locking */
         a = __ldcw_align(lock);
         while ((__ldcw(a) == 0) && --stuck)
-               while ((*a == 0) && --stuck);
+               while ((*a == 0) && stuck);

         if (stuck <= 0) {
                 printk(KERN_WARNING
@@ -108,12 +108,7 @@ int _dbg_spin_trylock(spinlock_t * lock,

  #ifdef CONFIG_DEBUG_RWLOCK

-/* If we're called with interrupts enabled and we've got readers (or 
other
- * writers) in interrupt handlers someone fucked up and we'd dead-lock
- * sooner or later anyway.   prumpf */
-
-/* More detailed explanation, thx Grant:
- * Here's the sequence:
+/* Interrupts trouble detailed explanation, thx Grant:
   *
   * o writer (wants to modify data) attempts to acquire the rwlock
   * o He gets the write lock.
diff -Nru linux-2.6.orig/include/asm-parisc/pgtable.h 
linux-2.6/include/asm-parisc/pgtable.h
--- linux-2.6.orig/include/asm-parisc/pgtable.h 2004-05-24 
06:03:24.000000000 +0200
+++ linux-2.6/include/asm-parisc/pgtable.h      2004-07-01 
21:25:41.000000000 +0200
@@ -443,7 +443,7 @@
  #ifdef CONFIG_SMP
  extern spinlock_t pa_dbit_lock;
  #else
-static int pa_dbit_lock; /* dummy to keep the compilers happy */
+static spinlock_t pa_dbit_lock; /* dummy to keep the compilers happy */
  #endif

  static inline pte_t ptep_get_and_clear(pte_t *ptep)