aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/kobject.h2
-rw-r--r--lib/kobject.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index d37cd7f10e3d..a659a97eccf1 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -22,7 +22,6 @@
22#include <linux/sysfs.h> 22#include <linux/sysfs.h>
23#include <linux/compiler.h> 23#include <linux/compiler.h>
24#include <linux/spinlock.h> 24#include <linux/spinlock.h>
25#include <linux/rwsem.h>
26#include <linux/kref.h> 25#include <linux/kref.h>
27#include <linux/kernel.h> 26#include <linux/kernel.h>
28#include <linux/wait.h> 27#include <linux/wait.h>
@@ -177,7 +176,6 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
177 176
178struct subsystem { 177struct subsystem {
179 struct kset kset; 178 struct kset kset;
180 struct rw_semaphore rwsem;
181}; 179};
182 180
183#define decl_subsys(_name,_type,_uevent_ops) \ 181#define decl_subsys(_name,_type,_uevent_ops) \
diff --git a/lib/kobject.c b/lib/kobject.c
index eb251aae78dd..2882aff6f3d1 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -652,7 +652,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
652 652
653void subsystem_init(struct subsystem * s) 653void subsystem_init(struct subsystem * s)
654{ 654{
655 init_rwsem(&s->rwsem);
656 kset_init(&s->kset); 655 kset_init(&s->kset);
657} 656}
658 657
@@ -661,8 +660,7 @@ void subsystem_init(struct subsystem * s)
661 * @s: the subsystem we're registering. 660 * @s: the subsystem we're registering.
662 * 661 *
663 * Once we register the subsystem, we want to make sure that 662 * Once we register the subsystem, we want to make sure that
664 * the kset points back to this subsystem for correct usage of 663 * the kset points back to this subsystem.
665 * the rwsem.
666 */ 664 */
667 665
668int subsystem_register(struct subsystem * s) 666int subsystem_register(struct subsystem * s)