diff options
author | 2014-06-17 17:30:23 -0400 | |
---|---|---|
committer | 2014-06-17 17:30:23 -0400 | |
commit | 170b5910d9fbea79de1bb40df22eda5f98250c0c (patch) | |
tree | ca9560e878d2842d45c6f99077d0d8b8f8b0f9ba /lib/kobject.c | |
parent | selinux: conditionally reschedule in hashtab_insert while loading selinux policy (diff) | |
parent | Linux 3.15 (diff) | |
download | wireguard-linux-170b5910d9fbea79de1bb40df22eda5f98250c0c.tar.xz wireguard-linux-170b5910d9fbea79de1bb40df22eda5f98250c0c.zip |
Merge tag 'v3.15' into next
Linux 3.15
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 cb14aeac4cca..58751bb80a7c 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; |