Fix up ACPI so that it seems to work in the new world order:

make driverfs initialize early, so that ACPI can come alive
in a world where you can register devices.

diff --git a/drivers/acpi/acpi_bus.c b/drivers/acpi/acpi_bus.c
index c900ce735f5210ee67011ec583061a2f96deddb7..fd9ba14f7e1cf4cb2662f5e38fedace341413169 100644 (file)
--- a/drivers/acpi/acpi_bus.c
+++ b/drivers/acpi/acpi_bus.c
@@ -1464,7 +1464,7 @@ acpi_bus_add (
         */
        switch (type) {
        case ACPI_BUS_TYPE_SYSTEM:
-               sprintf(device->pnp.bus_id, "%s", "root");
+               sprintf(device->pnp.bus_id, "%s", "ACPI");
                break;
        case ACPI_BUS_TYPE_POWER_BUTTON:
                sprintf(device->pnp.bus_id, "%s", "PWRF");

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 575bbf35b0e25b41775bff2003df2bf5d0812a4d..fd968fb79d5c8318aaa7fb8bb1eba506a1ee4921 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -139,7 +139,7 @@ static int __init device_init(void)
        return error;
 }
 
-subsys_initcall(device_init);
+core_initcall(device_init);
 
 EXPORT_SYMBOL(device_register);
 EXPORT_SYMBOL(put_device);

diff --git a/include/linux/init.h b/include/linux/init.h
index efe3a9a00877f3213f620ef1d2763f9049046073..142ec2f3aa68f96668dd30314c6b84568a32d193 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -60,10 +60,10 @@ extern initcall_t __initcall_start, __initcall_end;
 #define __define_initcall(level,fn) \
        static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn
 
-#define early_arch_initcall(fn)                __define_initcall("1",fn)
-#define mem_initcall(fn)               __define_initcall("2",fn)
-#define subsys_initcall(fn)            __define_initcall("3",fn)
-#define arch_initcall(fn)              __define_initcall("4",fn)
+#define core_initcall(fn)              __define_initcall("1",fn)
+#define unused_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)
 #define device_initcall(fn)            __define_initcall("6",fn)
 #define late_initcall(fn)              __define_initcall("7",fn)
@@ -159,10 +159,10 @@ typedef void (*__cleanup_module_func_t)(void);
 
 #define __setup(str,func) /* nothing */
 
-#define early_arch_initcall(fn)                module_init(fn)
-#define mem_initcall(fn)               module_init(fn)
-#define subsys_initcall(fn)            module_init(fn)
+#define core_initcall(fn)              module_init(fn)
+#define unused_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)
 #define device_initcall(fn)            module_init(fn)
 #define late_initcall(fn)              module_init(fn)