Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafefe93 authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman
Browse files

staging: zsmalloc: move object/handle masking defines 



This patch moves the definitions of _PFN_BITS, OBJ_INDEX_BITS
and OBJ_INDEX_MASK from zsmalloc-main.c to zsmalloc_int.h

They will be needed to determine ZS_MIN_ALLOC_SIZE in the next
patch

Signed-off-by: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: default avatarNitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bec25dfd

drivers/staging/zsmalloc/zsmalloc-main.c

+0 −12
Original line number Diff line number Diff line
@@ -40,18 +40,6 @@ 
#define CLASS_IDX_MASK	((1 << CLASS_IDX_BITS) - 1)

#define FULLNESS_MASK	((1 << FULLNESS_BITS) - 1)



/*

 * Object location (<PFN>, <obj_idx>) is encoded as

 * as single (void *) handle value.

 *

 * Note that object index <obj_idx> is relative to system

 * page <PFN> 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);

drivers/staging/zsmalloc/zsmalloc_int.h

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ 
 */

#define ZS_ALIGN		8



/*

 * Object location (<PFN>, <obj_idx>) is encoded as

 * as single (void *) handle value.

 *

 * Note that object index <obj_idx> is relative to system

 * page <PFN> 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