diff --git a/[refs] b/[refs] index 041c81569b6f..a97a811b983b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 138a0128c01899ee8492858a50856b90d0d9d815 +refs/heads/master: a5cf4b9a02cb9b8ac16eaafb0fcd7fd24215146e diff --git a/trunk/arch/s390/hypfs/inode.c b/trunk/arch/s390/hypfs/inode.c index bab560a1357a..18c091925ea5 100644 --- a/trunk/arch/s390/hypfs/inode.c +++ b/trunk/arch/s390/hypfs/inode.c @@ -302,11 +302,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) return rc; } -static struct super_block *hypfs_get_super(struct file_system_type *fst, - int flags, const char *devname, - void *data) +static int hypfs_get_super(struct file_system_type *fst, int flags, + const char *devname, void *data, struct vfsmount *mnt) { - return get_sb_single(fst, flags, data, hypfs_fill_super); + return get_sb_single(fst, flags, data, hypfs_fill_super, mnt); } static void hypfs_kill_super(struct super_block *sb)