upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / linux / kobject.h

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 187ac79..765d660 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -20,9 +20,11 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/sysfs.h>
+#include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/kref.h>
 #include <linux/kobject_uevent.h>
+#include <linux/kernel.h>
 #include <asm/atomic.h>
 
 #define KOBJ_NAME_LEN  20
@@ -101,6 +103,7 @@ struct kset {
        struct subsystem        * subsys;
        struct kobj_type        * ktype;
        struct list_head        list;
+       spinlock_t              list_lock;
        struct kobject          kobj;
        struct kset_hotplug_ops * hotplug_ops;
 };
@@ -167,6 +170,8 @@ struct subsystem _varname##_subsys = { \
        } \
 }
 
+/* The global /sys/kernel/ subsystem for people to chain off of */
+extern struct subsystem kernel_subsys;
 
 /**
  * Helpers for setting the kset of registered objects.