diff options
| author | Nitin Gupta <ngupta@vflare.org> | 2012-01-09 16:51:59 -0600 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:29 +1000 |
| commit | b87df97fb3e963b2f816fe9b355fbb3e0463e7d7 (patch) | |
| tree | 7994e4e42737d75a868e59b322781590e20aa9a8 /drivers/staging/zram/zram_drv.h | |
| parent | 6300749d0009cb3b326a24e81f39cc36c46c20d8 (diff) | |
| download | kernel_samsung_smdk4412-b87df97fb3e963b2f816fe9b355fbb3e0463e7d7.zip kernel_samsung_smdk4412-b87df97fb3e963b2f816fe9b355fbb3e0463e7d7.tar.gz kernel_samsung_smdk4412-b87df97fb3e963b2f816fe9b355fbb3e0463e7d7.tar.bz2 | |
staging: zram: replace xvmalloc with zsmalloc
Replaces xvmalloc with zsmalloc as the compressed page allocator
for zram
Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
drivers/staging/zram/zram_drv.c
Change-Id: I16edd3a5635bbe4ae69e871d47024c53067d7dd6
Diffstat (limited to 'drivers/staging/zram/zram_drv.h')
| -rw-r--r-- | drivers/staging/zram/zram_drv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/zram/zram_drv.h b/drivers/staging/zram/zram_drv.h index 77035b6..880f013 100644 --- a/drivers/staging/zram/zram_drv.h +++ b/drivers/staging/zram/zram_drv.h @@ -18,7 +18,7 @@ #include <linux/spinlock.h> #include <linux/mutex.h> -#include "xvmalloc.h" +#include "../zsmalloc/zsmalloc.h" /* * Some arbitrary value. This is just to catch @@ -51,7 +51,7 @@ static const size_t max_zpage_size = PAGE_SIZE / 4 * 3; /* * NOTE: max_zpage_size must be less than or equal to: - * XV_MAX_ALLOC_SIZE - sizeof(struct zobj_header) + * ZS_MAX_ALLOC_SIZE - sizeof(struct zobj_header) * otherwise, xv_malloc() would always return failure. */ @@ -81,8 +81,8 @@ enum zram_pageflags { /* Allocated for each disk page */ struct table { - struct page *page; - u16 offset; + void *handle; + u16 size; /* object size (excluding header) */ u8 count; /* object ref count (not yet used) */ u8 flags; } __attribute__((aligned(4))); @@ -102,7 +102,7 @@ struct zram_stats { }; struct zram { - struct xv_pool *mem_pool; + struct zs_pool *mem_pool; void *compress_workmem; void *compress_buffer; struct table *table; |