vserver 1.9.5.x5

[linux-2.6.git] / include / linux / bootmem.h

diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 376a550..0dd8ca1 100644 (file)
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -74,8 +74,23 @@ extern void *__init alloc_large_system_hash(const char *tablename,
                                            unsigned long bucketsize,
                                            unsigned long numentries,
                                            int scale,
-                                           int consider_highmem,
+                                           int flags,
                                            unsigned int *_hash_shift,
-                                           unsigned int *_hash_mask);
+                                           unsigned int *_hash_mask,
+                                           unsigned long limit);
+
+#define HASH_HIGHMEM   0x00000001      /* Consider highmem? */
+#define HASH_EARLY     0x00000002      /* Allocating during early boot? */
+
+/* Only NUMA needs hash distribution.
+ * IA64 is known to have sufficient vmalloc space.
+ */
+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64)
+#define HASHDIST_DEFAULT 1
+#else
+#define HASHDIST_DEFAULT 0
+#endif
+extern int __initdata hashdist;                /* Distribute hashes across NUMA nodes? */
+
 
 #endif /* _LINUX_BOOTMEM_H */