diff options
| author | Seth Jennings <sjenning@linux.vnet.ibm.com> | 2012-03-05 11:33:22 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-07 13:31:28 -0800 |
| commit | 6e00ec00b1a76a199b8c0acae401757b795daf57 (patch) | |
| tree | 4027a9ac683f82afefe24ffe57a6973362ba542d /drivers/staging/zsmalloc | |
| parent | 84d4faaba27991bde9fa5ec0716d14ad279ba8ab (diff) | |
| download | op-kernel-dev-6e00ec00b1a76a199b8c0acae401757b795daf57.zip op-kernel-dev-6e00ec00b1a76a199b8c0acae401757b795daf57.tar.gz | |
staging: zsmalloc: calculate MAX_PHYSMEM_BITS if not defined
This patch provides a way to determine or "set a
reasonable value for" MAX_PHYSMEM_BITS in the case that
it is not defined (i.e. !SPARSEMEM)
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/zsmalloc')
| -rw-r--r-- | drivers/staging/zsmalloc/zsmalloc_int.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/staging/zsmalloc/zsmalloc_int.h b/drivers/staging/zsmalloc/zsmalloc_int.h index 4d66d2d..ffb272f 100644 --- a/drivers/staging/zsmalloc/zsmalloc_int.h +++ b/drivers/staging/zsmalloc/zsmalloc_int.h @@ -39,7 +39,21 @@ * 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. + * + * This is made more complicated by various memory models and PAE. + */ + +#ifndef MAX_PHYSMEM_BITS +#ifdef CONFIG_HIGHMEM64G +#define MAX_PHYSMEM_BITS 36 +#else /* !CONFIG_HIGHMEM64G */ +/* + * If this definition of MAX_PHYSMEM_BITS is used, OBJ_INDEX_BITS will just + * be PAGE_SHIFT */ +#define MAX_PHYSMEM_BITS BITS_PER_LONG +#endif +#endif #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) |
