diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:41:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:41:36 +0300 |
| commit | f3391a160b22f8e006f3fb8ef39aa01da749fbf0 (patch) | |
| tree | 9a8f61fe1a3dd0d12e7511567b2344f80f5aa531 /drivers/misc/ibmasm/ibmasmfs.c | |
| parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
| download | linux-f3391a160b22f8e006f3fb8ef39aa01da749fbf0.tar.xz | |
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc/ibmasm/ibmasmfs.c')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasmfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index e8b933111e0d..9c677f3f3c26 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c @@ -116,8 +116,8 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) { struct inode *root; - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; + sb->s_blocksize = PAGE_SIZE; + sb->s_blocksize_bits = PAGE_SHIFT; sb->s_magic = IBMASMFS_MAGIC; sb->s_op = &ibmasmfs_s_ops; sb->s_time_gran = 1; |