diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
| commit | f7cef064aa01a1ac682c1945cc168b878cb118ff (patch) | |
| tree | 5dc256a4e01689eed60ab3e7a7ab8e50c5bcf602 /lib/kobject.c | |
| parent | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (diff) | |
| parent | ba341d55a420ab4fdd1a53fd395fd59bd65de880 (diff) | |
Merge branch 'driver-core-next' into cgroup/for-3.15
Pending kernfs conversion depends on kernfs improvements in
driver-core-next. Pull it into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index cb14aeac4cc..58751bb80a7 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -94,7 +94,7 @@ static int create_dir(struct kobject *kobj) BUG_ON(ops->type >= KOBJ_NS_TYPES); BUG_ON(!kobj_ns_type_registered(ops->type)); - kernfs_enable_ns(kobj->sd); + sysfs_enable_ns(kobj->sd); } return 0; |