Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-23 16:36:37 -08:00
commit 9d827ae691
1 changed files with 3 additions and 1 deletions

View File

@ -3373,8 +3373,10 @@ arc_init(void)
* than the addressable space (intel in 32-bit mode), we may * than the addressable space (intel in 32-bit mode), we may
* need to limit the cache to 1/8 of VM size. * need to limit the cache to 1/8 of VM size.
*/ */
#ifndef HAVE_SPL
arc_c = MIN(arc_c, vmem_size(heap_arena, VMEM_ALLOC | VMEM_FREE) / 8); arc_c = MIN(arc_c, vmem_size(heap_arena, VMEM_ALLOC | VMEM_FREE) / 8);
#endif #endif /* HAVE_SPL */
#endif /* _KERNEL */
/* set min cache to 1/32 of all memory, or 64MB, whichever is more */ /* set min cache to 1/32 of all memory, or 64MB, whichever is more */
arc_c_min = MAX(arc_c / 4, 64<<20); arc_c_min = MAX(arc_c / 4, 64<<20);