diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /include/linux/kmalloc_sizes.h | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
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 @@ | |||
| 19 | CACHE(32768) | 19 | CACHE(32768) |
| 20 | CACHE(65536) | 20 | CACHE(65536) |
| 21 | CACHE(131072) | 21 | CACHE(131072) |
| 22 | #ifndef CONFIG_MMU | 22 | #if (NR_CPUS > 512) || (MAX_NUMNODES > 256) || !defined(CONFIG_MMU) |
| 23 | CACHE(262144) | 23 | CACHE(262144) |
| 24 | #endif | ||
| 25 | #ifndef CONFIG_MMU | ||
| 24 | CACHE(524288) | 26 | CACHE(524288) |
| 25 | CACHE(1048576) | 27 | CACHE(1048576) |
| 26 | #ifdef CONFIG_LARGE_ALLOCS | 28 | #ifdef CONFIG_LARGE_ALLOCS |