[parisc-linux-cvs] Re: DIFF 2.6.7-pa11 use spin_is_locked/sba nit

[Grant Grundler]

On Sat, Jul 10, 2004 at 03:20:47PM -0600, Grant Grundler wrote:
> Log message:
> 2.6.7-pa11 revise firmware.c to use spin_is_locked().
> minor cleanup in SBA code.


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.217
diff -u -p -r1.217 Makefile
--- Makefile	10 Jul 2004 07:51:14 -0000	1.217
+++ Makefile	10 Jul 2004 21:19:05 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION = -pa10
+EXTRAVERSION = -pa11
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
Index: arch/parisc/kernel/firmware.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/firmware.c,v
retrieving revision 1.9
diff -u -p -r1.9 firmware.c
--- arch/parisc/kernel/firmware.c	10 Jul 2004 07:51:15 -0000	1.9
+++ arch/parisc/kernel/firmware.c	10 Jul 2004 21:19:05 -0000
@@ -177,8 +177,9 @@ void __init set_firmware_width(void)
  */
 void pdc_emergency_unlock(void)
 {
-        spin_trylock(&pdc_lock);  /* get pdc_lock before spinlock */
-        spin_unlock(&pdc_lock);   /* DEBUG code freaks out here. */
+ 	/* Spinlock DEBUG code freaks out if we unconditionally unlock */
+        if (spin_is_locked(&pdc_lock))
+		spin_unlock(&pdc_lock);
 }
 
 
Index: drivers/parisc/sba_iommu.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/parisc/sba_iommu.c,v
retrieving revision 1.11
diff -u -p -r1.11 sba_iommu.c
--- drivers/parisc/sba_iommu.c	4 Jun 2004 19:36:53 -0000	1.11
+++ drivers/parisc/sba_iommu.c	10 Jul 2004 21:19:06 -0000
@@ -769,7 +769,7 @@ sba_io_pdir_entry(u64 *pdir_ptr, space_t
 	ASSERT(sid == KERNEL_SPACE);
 
 	pa = virt_to_phys(vba);
-	pa &= ~4095ULL;			/* clear out offset bits */
+	pa &= IOVP_MASK;
 
 	mtsp(sid,1);
 	asm("lci 0(%%sr1, %1), %0" : "=r" (ci) : "r" (vba));