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 /fs/sysfs/mount.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 'fs/sysfs/mount.c')
| -rw-r--r-- | fs/sysfs/mount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c index 6211230814f..5c7fdd9c681 100644 --- a/fs/sysfs/mount.c +++ b/fs/sysfs/mount.c @@ -62,7 +62,7 @@ int __init sysfs_init(void) { int err; - sysfs_root = kernfs_create_root(NULL, NULL); + sysfs_root = kernfs_create_root(NULL, 0, NULL); if (IS_ERR(sysfs_root)) return PTR_ERR(sysfs_root); |