Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 7e9deed..4f6ba90 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -477,10 +477,12 @@ struct cache_sizes malloc_sizes[] = {
 EXPORT_SYMBOL(malloc_sizes);
 
 /* Must match cache_sizes above. Out of line to keep cache footprint low. */
-static struct cache_names {
+struct cache_names {
        char *name;
        char *name_dma;
-} cache_names[] = {
+};
+
+static struct cache_names __initdata cache_names[] = {
 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
 #include <linux/kmalloc_sizes.h>
        { 0, }