Hi Linus,
Please find enclosed a patch against 2.4.0-prerelease that :
- Fixes a lockup in handle_IRQ_event when using IrDA on an SMP
machine. It changes spin_lock_irqsave/spin_unlock_irq pairs to
spin_lock_irqsave/spin_unlock_irqrestore, which seems to be the
logical thing to do.
- Removes 2 unused functions that are broken on SPARC (hashbin_unlock
does a restore_flags when save_flags is done in hashbin_lock, which
messes register windows).
With this patch, IrDA is rock solid on my x86 SMP box (at least with
my usage patern...). It was crashing immediatly before (NMI watchdog).
A previous version of this patch has been reviewed by Andrew Morton,
who said it looked ok.
Thanks for applying it to your tree.
M.
--- linux/net/irda/irqueue.c.prerelease Thu Jan 4 10:21:13 2001
+++ linux/net/irda/irqueue.c Thu Jan 4 14:30:35 2001
@@ -8,6 +8,8 @@
* Created at: Tue Jun 9 13:29:31 1998
* Modified at: Sun Dec 12 13:48:22 1999
* Modified by: Dag Brattli <[EMAIL PROTECTED]>
+ * Modified at: Thu Jan 4 14:29:10 CET 2001
+ * Modified by: Marc Zyngier <[EMAIL PROTECTED]>
*
* Copyright (C) 1998-1999, Aage Kvalnes <[EMAIL PROTECTED]>
* Copyright (C) 1998, Dag Brattli,
@@ -142,69 +144,6 @@
}
/*
- * Function hashbin_lock (hashbin, hashv, name)
- *
- * Lock the hashbin
- *
- */
-void hashbin_lock(hashbin_t* hashbin, __u32 hashv, char* name,
- unsigned long flags)
-{
- int bin;
-
- IRDA_DEBUG(0, "hashbin_lock\n");
-
- ASSERT(hashbin != NULL, return;);
- ASSERT(hashbin->magic == HB_MAGIC, return;);
-
- /*
- * Locate hashbin
- */
- if (name)
- hashv = hash(name);
- bin = GET_HASHBIN(hashv);
-
- /* Synchronize */
- if ( hashbin->hb_type & HB_GLOBAL )
- spin_lock_irqsave(&hashbin->hb_mutex[ bin], flags);
- else {
- save_flags(flags);
- cli();
- }
-}
-
-/*
- * Function hashbin_unlock (hashbin, hashv, name)
- *
- * Unlock the hashbin
- *
- */
-void hashbin_unlock(hashbin_t* hashbin, __u32 hashv, char* name,
- unsigned long flags)
-{
- int bin;
-
- IRDA_DEBUG(0, "hashbin_unlock()\n");
-
- ASSERT(hashbin != NULL, return;);
- ASSERT(hashbin->magic == HB_MAGIC, return;);
-
- /*
- * Locate hashbin
- */
- if (name )
- hashv = hash(name);
- bin = GET_HASHBIN(hashv);
-
- /* Release lock */
- if ( hashbin->hb_type & HB_GLOBAL)
- spin_unlock_irq( &hashbin->hb_mutex[ bin]);
- else if (hashbin->hb_type & HB_LOCAL) {
- restore_flags( flags);
- }
-}
-
-/*
* Function hashbin_insert (hashbin, entry, name)
*
* Insert an entry into the hashbin
@@ -258,7 +197,7 @@
/* Release lock */
if ( hashbin->hb_type & HB_GLOBAL) {
- spin_unlock_irq( &hashbin->hb_mutex[ bin]);
+ spin_unlock_irqrestore( &hashbin->hb_mutex[ bin], flags);
} else if ( hashbin->hb_type & HB_LOCAL) {
restore_flags( flags);
@@ -327,7 +266,7 @@
/* Release lock */
if ( hashbin->hb_type & HB_GLOBAL) {
- spin_unlock_irq( &hashbin->hb_mutex[ bin]);
+ spin_unlock_irqrestore( &hashbin->hb_mutex[ bin], flags);
} else if ( hashbin->hb_type & HB_LOCAL) {
restore_flags( flags);
@@ -436,7 +375,7 @@
/* Release lock */
if ( hashbin->hb_type & HB_GLOBAL) {
- spin_unlock_irq( &hashbin->hb_mutex[ bin]);
+ spin_unlock_irqrestore( &hashbin->hb_mutex[ bin], flags);
} else if ( hashbin->hb_type & HB_LOCAL) {
restore_flags( flags);
@@ -511,7 +450,7 @@
/* Release lock */
if ( hashbin->hb_type & HB_GLOBAL) {
- spin_unlock_irq( &hashbin->hb_mutex[ bin]);
+ spin_unlock_irqrestore( &hashbin->hb_mutex[ bin], flags);
} else if ( hashbin->hb_type & HB_LOCAL) {
restore_flags( flags);
--
Places change, faces change. Life is so very strange.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
