--- memory.c.orig	2012-02-08 11:38:26.000000000 -0700
+++ memory.c	2012-02-08 16:08:18.000000000 -0700
@@ -7806,6 +7806,7 @@ vaddr_to_slab(ulong vaddr)
 char slab_hdr[100] = { 0 };
 char kmem_cache_hdr[100] = { 0 };
 char free_inuse_hdr[100] = { 0 };
+static int kmem_cache_nr_cpu = 0;
 
 static void
 kmem_cache_init(void)
@@ -7979,12 +7980,14 @@ kmem_cache_downsize(void)
 	int nr_node_ids;
 
 	if ((THIS_KERNEL_VERSION < LINUX(2,6,22)) ||
-	    (vt->flags & NODELISTS_IS_PTR) ||
 	    !(vt->flags & PERCPU_KMALLOC_V2_NODES) ||
 	    !kernel_symbol_exists("cache_cache") ||
 	    !MEMBER_EXISTS("kmem_cache", "buffer_size"))
 		return;
 
+	if (vt->flags & NODELISTS_IS_PTR) 
+		goto kmem_cache_s_nodelists_is_ptr;
+
 	cache_buf = GETBUF(SIZE(kmem_cache_s));
 
 	if (!readmem(symbol_value("cache_cache"), KVADDR, cache_buf, 
@@ -8026,6 +8029,21 @@ kmem_cache_downsize(void)
 	}
 
 	FREEBUF(cache_buf);
+	return;
+
+kmem_cache_s_nodelists_is_ptr:
+	/* struct array_cache array is actually sized by number of cpus */
+	/* real value is nr_cpu_ids, but fallback is kt->cpus */
+
+	if (symbol_exists("nr_cpu_ids"))
+		get_symbol_data("nr_cpu_ids", sizeof(int), &kmem_cache_nr_cpu);
+	else 
+		kmem_cache_nr_cpu = kt->cpus;
+	
+	ARRAY_LENGTH(kmem_cache_s_array) = kmem_cache_nr_cpu;
+	ASSIGN_SIZE(kmem_cache_s) = OFFSET(kmem_cache_s_array) +
+			sizeof(ulong) * kmem_cache_nr_cpu;
+
 }
 
 
@@ -8117,8 +8135,9 @@ kmem_cache_s_array_nodes:
             "array cache array", RETURN_ON_ERROR))
 		goto bail_out;
 
-	for (i = max_limit = 0; (i < ARRAY_LENGTH(kmem_cache_s_array)) && 
-	     cpudata[i]; i++) {
+	for (i = max_limit = 0; (i < kmem_cache_nr_cpu) 
+			&& (i < ARRAY_LENGTH(kmem_cache_s_array)) 
+			&& cpudata[i]; i++) {
                 if (!readmem(cpudata[i]+OFFSET(array_cache_limit),
                     KVADDR, &limit, sizeof(int),
                     "array cache limit", RETURN_ON_ERROR))