diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cpuset.c | 8 | ||||
-rw-r--r-- | kernel/futex.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index ab81fdd4572b..77f45ffd5ea1 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -392,11 +392,11 @@ static int cpuset_fill_super(struct super_block *sb, void *unused_data, | |||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||
395 | static struct super_block *cpuset_get_sb(struct file_system_type *fs_type, | 395 | static int cpuset_get_sb(struct file_system_type *fs_type, |
396 | int flags, const char *unused_dev_name, | 396 | int flags, const char *unused_dev_name, |
397 | void *data) | 397 | void *data, struct vfsmount *mnt) |
398 | { | 398 | { |
399 | return get_sb_single(fs_type, flags, data, cpuset_fill_super); | 399 | return get_sb_single(fs_type, flags, data, cpuset_fill_super, mnt); |
400 | } | 400 | } |
401 | 401 | ||
402 | static struct file_system_type cpuset_fs_type = { | 402 | static struct file_system_type cpuset_fs_type = { |
diff --git a/kernel/futex.c b/kernel/futex.c index 5699c512057b..e1a380c77a5a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -1056,11 +1056,11 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, int val, | |||
1056 | (unsigned long)uaddr2, val2, val3); | 1056 | (unsigned long)uaddr2, val2, val3); |
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | static struct super_block * | 1059 | static int futexfs_get_sb(struct file_system_type *fs_type, |
1060 | futexfs_get_sb(struct file_system_type *fs_type, | 1060 | int flags, const char *dev_name, void *data, |
1061 | int flags, const char *dev_name, void *data) | 1061 | struct vfsmount *mnt) |
1062 | { | 1062 | { |
1063 | return get_sb_pseudo(fs_type, "futex", NULL, 0xBAD1DEA); | 1063 | return get_sb_pseudo(fs_type, "futex", NULL, 0xBAD1DEA, mnt); |
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | static struct file_system_type futex_fs_type = { | 1066 | static struct file_system_type futex_fs_type = { |