Revert "move kdbus_subsys from namespace.c to main.c"

This reverts commit 1ca27c6e7e95d505f6bee190b8dd30dea6f415d1.

diff --git a/main.c b/main.c
index 3a9a84563d2d696febdb16176775e9b4e1abbf17..da12b203a05ea988699529b93fc1da1e743ffc75 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,11 +20,6 @@
 #include "internal.h"
 #include "namespace.h"
 
-/* kdbus sysfs subsystem */
-struct bus_type kdbus_subsys = {
-       .name = "kdbus",
-};
-
 static int __init kdbus_init(void)
 {
        int ret;

diff --git a/namespace.c b/namespace.c
index ab3eddcf784ab4827e2fa5bc1713c7d0bc875e45..7c1acbe58aadda9d4e351bd240584d70a0cbff8e 100644 (file)
--- a/namespace.c
+++ b/namespace.c
@@ -37,6 +37,11 @@ struct kdbus_ns *kdbus_ns_init;
 /* kdbus subsystem lock */
 static DEFINE_MUTEX(kdbus_subsys_lock);
 
+/* kdbus sysfs subsystem */
+struct bus_type kdbus_subsys = {
+       .name = "kdbus",
+};
+
 /* control nodes are world accessible */
 static char *kdbus_devnode_control(struct device *dev, umode_t *mode,
                                   kuid_t *uid, kgid_t *gid)