diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-08 00:47:30 +0300 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-08 00:47:30 +0300 |
| commit | f6e77c94796edad172602234826a022d463d910e (patch) | |
| tree | f5cb0848c9e848499b0f0676fafe7ff207538ae8 /include/linux/kmalloc_sizes.h | |
| parent | beb84dc8186662b17d5ea510fabb85cb7e266d33 (diff) | |
| parent | d0b004840bd3b5ff2f2a0ad14fa0bd43349f5175 (diff) | |
| download | linux-f6e77c94796edad172602234826a022d463d910e.tar.xz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 |