From d6e0122bb192ced9e864f6e2481084f46c03403d Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Fri, 10 Jun 2011 15:28:46 +0200 Subject: [PATCH] --- yaml --- r: 259831 b: refs/heads/master c: 6a587e835e3a8ea2fe9e8fd038553f2090666bd5 h: refs/heads/master i: 259829: 3709b5274c9ec79e85748b6750c5b94e6834c1fb 259827: 2cd0be11ef9247438935f45d10ccfbd94cdeb3ac 259823: 1411684c647069448bf841375779abe3d79e4922 v: v3 --- [refs] | 2 +- trunk/drivers/staging/zram/zram_drv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2fbf6efffa19..bf79703b56f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67f72befc7b7c5c9bd9fcdc2642b79180a9b9678 +refs/heads/master: 6a587e835e3a8ea2fe9e8fd038553f2090666bd5 diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c index aab4ec482124..3305e1a4dc1c 100644 --- a/trunk/drivers/staging/zram/zram_drv.c +++ b/trunk/drivers/staging/zram/zram_drv.c @@ -194,8 +194,7 @@ static void handle_uncompressed_page(struct zram *zram, unsigned char *user_mem, *cmem; user_mem = kmap_atomic(page, KM_USER0); - cmem = kmap_atomic(zram->table[index].page, KM_USER1) + - zram->table[index].offset; + cmem = kmap_atomic(zram->table[index].page, KM_USER1); memcpy(user_mem, cmem, PAGE_SIZE); kunmap_atomic(user_mem, KM_USER0);