diff options
| author | Emerson Pinter <dev@pinter.com.br> | 2013-09-09 11:36:49 -0300 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:29 +1000 |
| commit | fc7e733d52309daa17ffed203f3e177fcc2ea255 (patch) | |
| tree | 09b4ba033b1d93fccb3a58e4b72aad1a0a64d600 /drivers/staging | |
| parent | b87df97fb3e963b2f816fe9b355fbb3e0463e7d7 (diff) | |
| download | kernel_samsung_smdk4412-fc7e733d52309daa17ffed203f3e177fcc2ea255.tar.gz kernel_samsung_smdk4412-fc7e733d52309daa17ffed203f3e177fcc2ea255.tar.bz2 kernel_samsung_smdk4412-fc7e733d52309daa17ffed203f3e177fcc2ea255.zip | |
zram: fix merge
Change-Id: I4da7d373844a6615ff3ca53bec1da63080955a70
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/zram/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig index ee23a86ea7d..9d11a4cb99b 100644 --- a/drivers/staging/zram/Kconfig +++ b/drivers/staging/zram/Kconfig @@ -1,6 +1,8 @@ config ZRAM tristate "Compressed RAM block device support" - depends on BLOCK && SYSFS + # X86 dependency is because zsmalloc uses non-portable pte/tlb + # functions + depends on BLOCK && SYSFS && X86 select ZSMALLOC select LZO_COMPRESS select LZO_DECOMPRESS diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index dadb75b41aa..df26f6c6353 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -457,11 +457,11 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, if (rw == READ) { down_read(&zram->lock); - ret = zram_bvec_read(zram, bvec, index, bio); + ret = zram_bvec_read(zram, bvec, index, offset, bio); up_read(&zram->lock); } else { down_write(&zram->lock); - ret = zram_bvec_write(zram, bvec, index); + ret = zram_bvec_write(zram, bvec, index, offset); up_write(&zram->lock); } |