Re: [2.5.19] Oops during PCI scan on Alpha

[Patrick Mochel]

> We're talking in circles and the fixes you're proposing are not
> going to fix the bug, just create new versions of the old bug.

Go crazy. Also available from bk://linux.bkbits.net/linux-2.5

	-pat

ChangeSet@1.418, 2002-06-04 14:58:08-07:00, [e-mail]
  s/subsys_initcall/postcore_initcall/ for sys_bys and pci, so they get initialized early enough for arch and subsys initcalls to use them.
  

 drivers/base/sys.c       |    2 +-
 drivers/pci/pci-driver.c |    2 +-
 2 files changed, 2 insertions, 2 deletions

ChangeSet@1.417, 2002-06-04 14:57:10-07:00, [e-mail]
  Change unused_initcall to postcore_initcall for things that must be initialized early, but not too early (after the core is done)

 include/linux/init.h |    4 ++--
 1 files changed, 2 insertions, 2 deletions

diff -Nru a/drivers/base/sys.c b/drivers/base/sys.c
--- a/drivers/base/sys.c	Tue Jun  4 15:01:14 2002
+++ b/drivers/base/sys.c	Tue Jun  4 15:01:14 2002
@@ -44,6 +44,6 @@
        return device_register(&system_bus);
 }
 
-subsys_initcall(sys_bus_init);
+postcore_initcall(sys_bus_init);
 EXPORT_SYMBOL(register_sys_device);
 EXPORT_SYMBOL(unregister_sys_device);
diff -Nru a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
--- a/drivers/pci/pci-driver.c	Tue Jun  4 15:01:14 2002
+++ b/drivers/pci/pci-driver.c	Tue Jun  4 15:01:14 2002
@@ -204,7 +204,7 @@
 	return bus_register(&pci_bus_type);
 }
 
-subsys_initcall(pci_driver_init);
+postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_device);
 EXPORT_SYMBOL(pci_register_driver);
diff -Nru a/include/linux/init.h b/include/linux/init.h
--- a/include/linux/init.h	Tue Jun  4 15:01:14 2002
+++ b/include/linux/init.h	Tue Jun  4 15:01:14 2002
@@ -61,7 +61,7 @@
 	static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn
 
 #define core_initcall(fn)		__define_initcall("1",fn)
-#define unused_initcall(fn)		__define_initcall("2",fn)
+#define postcore_initcall(fn)		__define_initcall("2",fn)
 #define arch_initcall(fn)		__define_initcall("3",fn)
 #define subsys_initcall(fn)		__define_initcall("4",fn)
 #define fs_initcall(fn)			__define_initcall("5",fn)
@@ -160,7 +160,7 @@
 #define __setup(str,func) /* nothing */
 
 #define core_initcall(fn)		module_init(fn)
-#define unused_initcall(fn)		module_init(fn)
+#define postcore_initcall(fn)		module_init(fn)
 #define arch_initcall(fn)		module_init(fn)
 #define subsys_initcall(fn)		module_init(fn)
 #define fs_initcall(fn)			module_init(fn)