diff --git a/[refs] b/[refs] index 146426b3bc44..bfe58fdc3bbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca3d70bd68455133eabcb8a0ae1b40254d87188b +refs/heads/master: cad683fb9d53fa2cbcf82660e663fa1180f86797 diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c index 8115be90517c..10d75929bc29 100644 --- a/trunk/drivers/staging/zram/zram_drv.c +++ b/trunk/drivers/staging/zram/zram_drv.c @@ -126,8 +126,7 @@ static void zram_set_disksize(struct zram *zram, size_t totalram_bytes) "\tMemory Size: %zu kB\n" "\tSize you selected: %llu kB\n" "Continuing anyway ...\n", - totalram_bytes >> 10, zram->disksize - ); + totalram_bytes >> 10, zram->disksize >> 10); } zram->disksize &= PAGE_MASK;