diff --git a/[refs] b/[refs] index fff76ca9ec6d..2906f9bb38cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d039c688c6b3e7217381d2804bc0ca3171913fec +refs/heads/master: e073ae1b34d5600ffc550407625dcb2d4cf46c6e diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h index 81c07cd18643..0365ec9fc0c9 100644 --- a/trunk/include/linux/bootmem.h +++ b/trunk/include/linux/bootmem.h @@ -122,9 +122,9 @@ extern void *alloc_large_system_hash(const char *tablename, #define HASH_EARLY 0x00000001 /* Allocating during early boot? */ /* Only NUMA needs hash distribution. - * IA64 is known to have sufficient vmalloc space. + * IA64 and x86_64 have sufficient vmalloc space. */ -#if defined(CONFIG_NUMA) && defined(CONFIG_IA64) +#if defined(CONFIG_NUMA) && (defined(CONFIG_IA64) || defined(CONFIG_X86_64)) #define HASHDIST_DEFAULT 1 #else #define HASHDIST_DEFAULT 0