diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:09 +0100 |
| commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
| tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /drivers/misc/ibmasm/ibmasmfs.c | |
| parent | ASoC: Intel: Atom: fix boot warning (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc-linus (diff) | |
| download | wireguard-linux-0ce8428ba9ea13098b828d0881e28368a108709c.tar.xz wireguard-linux-0ce8428ba9ea13098b828d0881e28368a108709c.zip | |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to '')
| -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; |