Kobject: add NULL to decl_subsys() due to addition of hotplug operations

diff --git a/arch/i386/kernel/edd.c b/arch/i386/kernel/edd.c
index e8d64be5d907e648b723b8c6715a8cdf486e1be1..78a1a5846af9b0e3605a6b06bc128bc0f8bc2823 100644 (file)
--- a/arch/i386/kernel/edd.c
+++ b/arch/i386/kernel/edd.c
@@ -598,7 +598,7 @@ static struct kobj_type ktype_edd = {
        .default_attrs  = def_attrs,
 };
 
-static decl_subsys(edd,&ktype_edd);
+static decl_subsys(edd,&ktype_edd,NULL);
 
 
 /**

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 1cad601f1ca9487969ef7df6aecc58f63caf0e72..dc450c6405947f42f94c0b804c846a90781e5138 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -676,7 +676,7 @@ error0:
        return_VALUE(-ENODEV);
 }
 
-decl_subsys(acpi,NULL);
+decl_subsys(acpi,NULL,NULL);
 
 static int __init acpi_init (void)
 {

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 1e4a63e9d9f3f8d635b97999ad9a149c928a5219..e918f4db4840ff5e323a3062f4929ddd1a09455e 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -132,7 +132,7 @@ static struct kobj_type ktype_bus = {
 
 };
 
-decl_subsys(bus,&ktype_bus);
+decl_subsys(bus,&ktype_bus,NULL);
 
 /**
  *     bus_for_each_dev - device iterator.

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 9007e99c0d7317f75f8f75bb30ba921268efdeb8..8e35b788427648bdbaca9ad5679e1a9b26b5d7e9 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -49,7 +49,9 @@ static struct kobj_type ktype_devclass = {
        .sysfs_ops      = &class_sysfs_ops,
 };
 
-static decl_subsys(class,&ktype_devclass);
+/* Classes can't use the kobject hotplug logic, as
+ * they do not add new kobjects to the system */
+static decl_subsys(class,&ktype_devclass,NULL);
 
 
 static int devclass_dev_link(struct device_class * cls, struct device * dev)

diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index d6ddcd338528b5ffef42b5f51c3fb199ac7deb85..490f4e8f6507579abd134adf840068475a7b1c8c 100644 (file)
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -6,7 +6,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-static decl_subsys(firmware,NULL);
+static decl_subsys(firmware,NULL,NULL);
 
 int firmware_register(struct subsystem * s)
 {

diff --git a/fs/filesystems.c b/fs/filesystems.c
index 4fcca5d3479d910e09fc9e18e89cddaa359b519c..a87d637e168a13e3f2c8174b3629651f6b805b96 100644 (file)
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -61,7 +61,7 @@ static struct file_system_type **find_filesystem(const char *name)
 
 
 /* define fs_subsys */
-static decl_subsys(fs, NULL);
+static decl_subsys(fs, NULL, NULL);
 
 static int register_fs_subsys(struct file_system_type * fs)
 {

diff --git a/net/core/dev.c b/net/core/dev.c
index 17e32722281bd3c86369bd7e072639f35ae30b1e..af39045da11ce347a6d026b2f901c94373c41e4d 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2815,7 +2815,7 @@ extern void ip_auto_config(void);
 extern void dv_init(void);
 #endif /* CONFIG_NET_DIVERT */
 
-static decl_subsys(net,NULL);
+static decl_subsys(net,NULL,NULL);
 
 
 /*