diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
| commit | d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch) | |
| tree | a6471779a25cf2794542f9441213f5aa5f337f2f /include/linux/kmalloc_sizes.h | |
| parent | fbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff) | |
| parent | ed62178589929d248a0aaf4018ca3867e2f96d9d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/kmalloc_sizes.h')
| -rw-r--r-- | include/linux/kmalloc_sizes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kmalloc_sizes.h b/include/linux/kmalloc_sizes.h index d82d4c05c12d..bda23e00ed71 100644 --- a/include/linux/kmalloc_sizes.h +++ b/include/linux/kmalloc_sizes.h @@ -19,8 +19,10 @@ CACHE(32768) CACHE(65536) CACHE(131072) -#ifndef CONFIG_MMU +#if (NR_CPUS > 512) || (MAX_NUMNODES > 256) || !defined(CONFIG_MMU) CACHE(262144) +#endif +#ifndef CONFIG_MMU CACHE(524288) CACHE(1048576) #ifdef CONFIG_LARGE_ALLOCS |