From 4f08bbfa6ea8a6009b55424fbf1a25233f05cddd Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 5 Mar 2012 11:33:20 -0600 Subject: [PATCH] --- yaml --- r: 289188 b: refs/heads/master c: aafefe932a46f7d0a85b6c48e71befd1003d1e6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/zsmalloc/zsmalloc-main.c | 12 ------------ trunk/drivers/staging/zsmalloc/zsmalloc_int.h | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 31e26ead8d36..b4dc1b8b0ae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bec25dfd850cf92cba894c94d6660fc18d3a7447 +refs/heads/master: aafefe932a46f7d0a85b6c48e71befd1003d1e6b diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c index 455fc2f97246..240bcbff263a 100644 --- a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c @@ -40,18 +40,6 @@ #define CLASS_IDX_MASK ((1 << CLASS_IDX_BITS) - 1) #define FULLNESS_MASK ((1 << FULLNESS_BITS) - 1) -/* - * Object location (, ) is encoded as - * as single (void *) handle value. - * - * Note that object index is relative to system - * page it is stored in, so for each sub-page belonging - * to a zspage, obj_idx starts with 0. - */ -#define _PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) -#define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS) -#define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) - /* per-cpu VM mapping areas for zspage accesses that cross page boundaries */ static DEFINE_PER_CPU(struct mapping_area, zs_map_area); diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc_int.h b/trunk/drivers/staging/zsmalloc/zsmalloc_int.h index 354a02001434..e06e142e3acc 100644 --- a/trunk/drivers/staging/zsmalloc/zsmalloc_int.h +++ b/trunk/drivers/staging/zsmalloc/zsmalloc_int.h @@ -25,6 +25,18 @@ */ #define ZS_ALIGN 8 +/* + * Object location (, ) is encoded as + * as single (void *) handle value. + * + * Note that object index is relative to system + * page it is stored in, so for each sub-page belonging + * to a zspage, obj_idx starts with 0. + */ +#define _PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) +#define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS) +#define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) + /* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ #define ZS_MIN_ALLOC_SIZE 32 #define ZS_MAX_ALLOC_SIZE PAGE_SIZE