diff --git a/[refs] b/[refs]
index face3d272197..00a92bab48f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84d4faaba27991bde9fa5ec0716d14ad279ba8ab
+refs/heads/master: 6e00ec00b1a76a199b8c0acae401757b795daf57
diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc_int.h b/trunk/drivers/staging/zsmalloc/zsmalloc_int.h
index 4d66d2dd92f5..ffb272f89343 100644
--- a/trunk/drivers/staging/zsmalloc/zsmalloc_int.h
+++ b/trunk/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)