---

yaml --- r: 9119 b: refs/heads/master c: 51574e0 h: refs/heads/master i: 9117: dad5abc 9115: 2671336 9111: 3630279 9103: 7318ff0 9087: 671a5c0 v: v3
git-mirror · Sep 19, 2005 · 81e0e34 · 81e0e34
1 parent 3173858
commit 81e0e34
Show file tree

Hide file tree

Showing 88 changed files with 2,232 additions and 6,836 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d67e34de5a378de2f461137944c5d931283d557
+refs/heads/master: 51574e0398a2d93cbf7f26e36b673cd919062268
diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 14
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc1
 NAME=Affluent Albatross
 
 # *DOCUMENTATION*

diff --git a/trunk/arch/alpha/kernel/sys_dp264.c b/trunk/arch/alpha/kernel/sys_dp264.c
@@ -394,22 +394,6 @@ clipper_init_irq(void)
  *  10	 64 bit PCI option slot 3 (not bus 0)
  */
 
-static int __init
-isa_irq_fixup(struct pci_dev *dev, int irq)
-{
-	u8 irq8;
-
-	if (irq > 0)
-		return irq;
-
-	/* This interrupt is routed via ISA bridge, so we'll
-	   just have to trust whatever value the console might
-	   have assigned.  */
-	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq8);
-
-	return irq8 & 0xf;
-}
-
 static int __init
 dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
@@ -423,13 +407,25 @@ dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 		{ 16+ 3, 16+ 3, 16+ 2, 16+ 1, 16+ 0}  /* IdSel 10 slot 3 */
 	};
 	const long min_idsel = 5, max_idsel = 10, irqs_per_slot = 5;
+
 	struct pci_controller *hose = dev->sysdata;
 	int irq = COMMON_TABLE_LOOKUP;
 
-	if (irq > 0)
+	if (irq > 0) {
 		irq += 16 * hose->index;
+	} else {
+		/* ??? The Contaq IDE controller on the ISA bridge uses
+		   "legacy" interrupts 14 and 15.  I don't know if anything
+		   can wind up at the same slot+pin on hose1, so we'll
+		   just have to trust whatever value the console might
+		   have assigned.  */
+
+		u8 irq8;
+		pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq8);
+		irq = irq8;
+	}
 
-	return isa_irq_fixup(dev, irq);
+	return irq;
 }
 
 static int __init
@@ -457,8 +453,7 @@ monet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 		{    24,    24,    25,    26,    27}  /* IdSel 15 slot 5 PCI2*/
 	};
 	const long min_idsel = 3, max_idsel = 15, irqs_per_slot = 5;
-
-	return isa_irq_fixup(dev, COMMON_TABLE_LOOKUP);
+	return COMMON_TABLE_LOOKUP;
 }
 
 static u8 __init
@@ -512,8 +507,7 @@ webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 		{    47,    47,    46,    45,    44}, /* IdSel 17 slot 3 */
 	};
 	const long min_idsel = 7, max_idsel = 17, irqs_per_slot = 5;
-
-	return isa_irq_fixup(dev, COMMON_TABLE_LOOKUP);
+	return COMMON_TABLE_LOOKUP;
 }
 
 static int __init
@@ -530,13 +524,14 @@ clipper_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 		{    -1,    -1,    -1,    -1,    -1}  /* IdSel 7 ISA Bridge */
 	};
 	const long min_idsel = 1, max_idsel = 7, irqs_per_slot = 5;
+
 	struct pci_controller *hose = dev->sysdata;
 	int irq = COMMON_TABLE_LOOKUP;
 
 	if (irq > 0)
 		irq += 16 * hose->index;
 
-	return isa_irq_fixup(dev, irq);
+	return irq;
 }
 
 static void __init

diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1005,6 +1005,7 @@ static struct net_device *ipoib_add_port(const char *format,
 
 register_failed:
 	ib_unregister_event_handler(&priv->event_handler);
+	flush_scheduled_work();
 
 event_failed:
 	ipoib_dev_cleanup(priv->dev);
@@ -1057,6 +1058,7 @@ static void ipoib_remove_one(struct ib_device *device)
 
 	list_for_each_entry_safe(priv, tmp, dev_list, list) {
 		ib_unregister_event_handler(&priv->event_handler);
+		flush_scheduled_work();
 
 		unregister_netdev(priv->dev);
 		ipoib_dev_cleanup(priv->dev);

diff --git a/trunk/drivers/message/fusion/Kconfig b/trunk/drivers/message/fusion/Kconfig
@@ -35,23 +35,6 @@ config FUSION_FC
 	  LSIFC929X
 	  LSIFC929XL
 
-config FUSION_SAS
-	tristate "Fusion MPT ScsiHost drivers for SAS"
-	depends on PCI && SCSI
- 	select FUSION
-	select SCSI_SAS_ATTRS
-	---help---
-	  SCSI HOST support for a SAS host adapters.
-
-	  List of supported controllers:
-
-	  LSISAS1064
-	  LSISAS1066
-	  LSISAS1068
-	  LSISAS1064E
-	  LSISAS1066E
-	  LSISAS1068E
-
 config FUSION_MAX_SGE
 	int "Maximum number of scatter gather entries (16 - 128)"
 	depends on FUSION

diff --git a/trunk/drivers/message/fusion/Makefile b/trunk/drivers/message/fusion/Makefile
@@ -34,6 +34,5 @@
 
 obj-$(CONFIG_FUSION_SPI)	+= mptbase.o mptscsih.o mptspi.o
 obj-$(CONFIG_FUSION_FC)		+= mptbase.o mptscsih.o mptfc.o
-obj-$(CONFIG_FUSION_SAS)	+= mptbase.o mptscsih.o mptsas.o
 obj-$(CONFIG_FUSION_CTL)	+= mptctl.o
 obj-$(CONFIG_FUSION_LAN)	+= mptlan.o