diff --git a/[refs] b/[refs] index cc15274a4f94..eadd8092bc17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bef41c267e2b903f411c0f56236027f68553b721 +refs/heads/master: 18df22524202ebd3416f391393e5aa986a31dc9d diff --git a/trunk/fs/hugetlbfs/inode.c b/trunk/fs/hugetlbfs/inode.c index aa93f9532607..e425ad9d0490 100644 --- a/trunk/fs/hugetlbfs/inode.c +++ b/trunk/fs/hugetlbfs/inode.c @@ -472,7 +472,7 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb, static struct inode *hugetlbfs_get_inode(struct super_block *sb, struct inode *dir, - int mode, dev_t dev) + umode_t mode, dev_t dev) { struct inode *inode;