drop modular-ide.patch
svn path=/dists/trunk/linux-2.6/; revision=5006
This commit is contained in:
maximilian attems
parent
df9349aaac
commit
e2f238bdbe
|
|
@ -1,8 +1,13 @@
|
|||
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
|
||||
|
||||
[ dann frazier ]
|
||||
* Update ia64 configs
|
||||
|
||||
-- dann frazier <dannf@debian.org> Sun, 11 Dec 2005 12:27:13 -0700
|
||||
[ maximilian attems ]
|
||||
* Drop modular-ide.patch, nacked by ide upstream. Prevents udev to load
|
||||
ide-generic and those successfull boots with initramfs-tools.
|
||||
|
||||
-- maximilian attems <max@sputnik.stro.at> Mon, 12 Dec 2005 13:00:49 +0100
|
||||
|
||||
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -1,126 +0,0 @@
|
|||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: Description: fix IDE modularisation
|
||||
## DP: Patch author: Herbert Xu
|
||||
## DP: Upstream status: rejected
|
||||
#
|
||||
diff -ruN source-old/drivers/ide/ide-generic.c source/drivers/ide/ide-generic.c
|
||||
--- source-old/drivers/ide/ide-generic.c 2005-10-28 02:02:08.000000000 +0200
|
||||
+++ source/drivers/ide/ide-generic.c 2005-12-01 14:08:41.000000000 +0100
|
||||
@@ -11,9 +11,14 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/ide.h>
|
||||
+#include <linux/config.h>
|
||||
|
||||
static int __init ide_generic_init(void)
|
||||
{
|
||||
+#ifdef CONFIG_BLK_DEV_IDEPCI
|
||||
+ ide_scan_pcibus();
|
||||
+#endif
|
||||
+
|
||||
if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
|
||||
ide_get_lock(NULL, NULL); /* for atari only */
|
||||
|
||||
diff -ruN source-old/drivers/ide/ide.c source/drivers/ide/ide.c
|
||||
--- source-old/drivers/ide/ide.c 2005-12-01 13:56:23.000000000 +0100
|
||||
+++ source/drivers/ide/ide.c 2005-12-01 14:08:41.000000000 +0100
|
||||
@@ -175,10 +175,11 @@
|
||||
static int initializing; /* set while initializing built-in drivers */
|
||||
|
||||
DECLARE_MUTEX(ide_cfg_sem);
|
||||
+EXPORT_SYMBOL(ide_cfg_sem);
|
||||
__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 */
|
||||
+int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IDEDMA_AUTO
|
||||
@@ -1417,6 +1418,8 @@
|
||||
|
||||
EXPORT_SYMBOL(generic_ide_ioctl);
|
||||
|
||||
+EXPORT_SYMBOL(ide_add_generic_settings);
|
||||
+
|
||||
/*
|
||||
* stridx() returns the offset of c within s,
|
||||
* or -1 if c is '\0' or not found within s.
|
||||
@@ -1796,9 +1799,9 @@
|
||||
*/
|
||||
static void __init probe_for_hwifs (void)
|
||||
{
|
||||
-#ifdef CONFIG_BLK_DEV_IDEPCI
|
||||
- ide_scan_pcibus(ide_scan_direction);
|
||||
-#endif /* CONFIG_BLK_DEV_IDEPCI */
|
||||
+#if defined(CONFIG_BLK_DEV_IDEPCI) && !defined(MODULE)
|
||||
+ ide_scan_pcibus();
|
||||
+#endif /* CONFIG_BLK_DEV_IDEPCI && !MODULE */
|
||||
|
||||
#ifdef CONFIG_ETRAX_IDE
|
||||
{
|
||||
diff -ruN source-old/drivers/ide/setup-pci.c source/drivers/ide/setup-pci.c
|
||||
--- source-old/drivers/ide/setup-pci.c 2005-12-01 11:22:33.000000000 +0100
|
||||
+++ source/drivers/ide/setup-pci.c 2005-12-01 14:08:41.000000000 +0100
|
||||
@@ -840,7 +840,7 @@
|
||||
* boot up the pci layer takes over the job.
|
||||
*/
|
||||
|
||||
-static int __init ide_scan_pcidev(struct pci_dev *dev)
|
||||
+static int ide_scan_pcidev(struct pci_dev *dev)
|
||||
{
|
||||
struct list_head *l;
|
||||
struct pci_driver *d;
|
||||
@@ -866,21 +866,23 @@
|
||||
|
||||
/**
|
||||
* ide_scan_pcibus - perform the initial IDE driver scan
|
||||
- * @scan_direction: set for reverse order scanning
|
||||
*
|
||||
* Perform the initial bus rather than driver ordered scan of the
|
||||
* PCI drivers. After this all IDE pci handling becomes standard
|
||||
* module ordering not traditionally ordered.
|
||||
*/
|
||||
|
||||
-void __init ide_scan_pcibus (int scan_direction)
|
||||
+void ide_scan_pcibus(void)
|
||||
{
|
||||
struct pci_dev *dev = NULL;
|
||||
struct pci_driver *d;
|
||||
struct list_head *l, *n;
|
||||
|
||||
+ if (!pre_init)
|
||||
+ return;
|
||||
+
|
||||
pre_init = 0;
|
||||
- if (!scan_direction) {
|
||||
+ if (!ide_scan_direction) {
|
||||
while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
|
||||
ide_scan_pcidev(dev);
|
||||
}
|
||||
@@ -902,3 +904,5 @@
|
||||
__pci_register_driver(d, d->driver.owner);
|
||||
}
|
||||
}
|
||||
+
|
||||
+EXPORT_SYMBOL_GPL(ide_scan_pcibus);
|
||||
diff -ruN source-old/include/linux/ide.h source/include/linux/ide.h
|
||||
--- source-old/include/linux/ide.h 2005-12-01 11:22:35.000000000 +0100
|
||||
+++ source/include/linux/ide.h 2005-12-01 16:02:36.000000000 +0100
|
||||
@@ -1122,6 +1122,7 @@
|
||||
extern ide_hwif_t ide_hwifs[]; /* master data repository */
|
||||
#endif
|
||||
extern int noautodma;
|
||||
+extern int ide_scan_direction;
|
||||
|
||||
extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
|
||||
extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs);
|
||||
@@ -1304,7 +1305,7 @@
|
||||
|
||||
extern int ideprobe_init(void);
|
||||
|
||||
-extern void ide_scan_pcibus(int scan_direction) __init;
|
||||
+extern void ide_scan_pcibus(void);
|
||||
extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
|
||||
#define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
|
||||
extern void ide_pci_unregister_driver(struct pci_driver *driver);
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
+ fbdev-radeon-noaccel.patch
|
||||
+ fs-asfs-2.patch
|
||||
+ ia64-irq-affinity-upfix.patch
|
||||
+ modular-ide.patch
|
||||
+ modular-ide-pnp.patch
|
||||
#+ powerpc-calibrate-tau.patch
|
||||
#+ powerpc-g3-750cxe.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue