diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
| commit | af9cc93c0dee5fc1f9fa32cd9d79a456738a21be (patch) | |
| tree | 91aed45708ad9782de42560ecd25ea5f740dae9b /fs/freevxfs/vxfs_immed.c | |
| parent | bb03ed216370cb021f377f923471e56d1de3ff5d (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
| download | talos-op-linux-af9cc93c0dee5fc1f9fa32cd9d79a456738a21be.tar.gz talos-op-linux-af9cc93c0dee5fc1f9fa32cd9d79a456738a21be.zip | |
Merge tag 'asoc-fix-v4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
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 'fs/freevxfs/vxfs_immed.c')
| -rw-r--r-- | fs/freevxfs/vxfs_immed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c index cb84f0fcc72a..bfc780c682fb 100644 --- a/fs/freevxfs/vxfs_immed.c +++ b/fs/freevxfs/vxfs_immed.c @@ -66,11 +66,11 @@ static int vxfs_immed_readpage(struct file *fp, struct page *pp) { struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host); - u_int64_t offset = (u_int64_t)pp->index << PAGE_CACHE_SHIFT; + u_int64_t offset = (u_int64_t)pp->index << PAGE_SHIFT; caddr_t kaddr; kaddr = kmap(pp); - memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE); + memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_SIZE); kunmap(pp); flush_dcache_page(pp); |
