r2656 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[maximilian attems]

Author: maks-guest
Date: 2005-03-08 22:44:08 +0100 (Tue, 08 Mar 2005)
New Revision: 2656

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide.dpatch
Log:
modular-ide.dpatch applies, but needs still drivers-ide-__devinit.dpatch


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide.dpatch	2005-03-08 21:12:53 UTC (rev 2655)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide.dpatch	2005-03-08 21:44:08 UTC (rev 2656)
@@ -33,7 +33,7 @@
  
  DECLARE_MUTEX(ide_cfg_sem);
 +EXPORT_SYMBOL(ide_cfg_sem);
- spinlock_t ide_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+  __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
  
  #ifdef CONFIG_BLK_DEV_IDEPCI
 -static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
@@ -41,7 +41,7 @@
  #endif
  
  #ifdef CONFIG_IDEDMA_AUTO
-@@ -1364,6 +1365,8 @@
+@@ -1317,6 +1318,8 @@
  
  EXPORT_SYMBOL(system_bus_clock);
  
@@ -50,7 +50,7 @@
  /*
   *	Locking is badly broken here - since way back.  That sucker is
   * root-only, but that's not an excuse...  The real question is what
-@@ -2011,9 +2014,9 @@
+@@ -1962,9 +1965,9 @@
   */
  static void __init probe_for_hwifs (void)
  {
@@ -65,7 +65,7 @@
  	{
 --- 1.25/drivers/ide/setup-pci.c	2004-06-01 21:04:38 +02:00
 +++ edited/drivers/ide/setup-pci.c	2004-06-16 15:44:18 +02:00
-@@ -821,7 +821,7 @@
+@@ -837,7 +837,7 @@
   *	boot up the pci layer takes over the job.
   */
   
@@ -74,7 +74,7 @@
  {
  	struct list_head *l;
  	struct pci_driver *d;
-@@ -847,21 +847,23 @@
+@@ -863,21 +863,23 @@
  
  /**
   *	ide_scan_pcibus		-	perform the initial IDE driver scan
@@ -101,7 +101,7 @@
  		while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
  			ide_scan_pcidev(dev);
  		}
-@@ -883,3 +885,5 @@
+@@ -899,3 +901,5 @@
  		pci_register_driver(d);
  	}
  }
@@ -109,7 +109,7 @@
 +EXPORT_SYMBOL_GPL(ide_scan_pcibus);
 --- 1.124/include/linux/ide.h	2004-06-05 21:58:33 +02:00
 +++ edited/include/linux/ide.h	2004-06-16 15:44:18 +02:00
-@@ -1224,6 +1224,7 @@
+@@ -1128,6 +1128,7 @@
  extern	ide_hwif_t	ide_hwifs[];		/* master data repository */
  #endif
  extern int noautodma;
@@ -117,7 +117,7 @@
  
  extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
  
-@@ -1524,7 +1525,7 @@
+@@ -1337,7 +1338,7 @@
  
  extern int ideprobe_init(void);
  
@@ -125,4 +125,4 @@
 +extern void ide_scan_pcibus(void);
  extern int ide_pci_register_driver(struct pci_driver *driver);
  extern void ide_pci_unregister_driver(struct pci_driver *driver);
- extern void ide_pci_setup_ports(struct pci_dev *dev, struct ide_pci_device_s *d, int autodma, int pciirq, ata_index_t *index);
+ void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);