From 76df2be266f5724f0c854b87f21ab723635934e6 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 6 Dec 2006 20:37:33 -0800 Subject: [PATCH] --- yaml --- r: 42844 b: refs/heads/master c: 04903664325acb3f199dd8a4b8f1aa437e9fd6b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/bootmem.h | 3 +-- trunk/mm/page_alloc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 112859a06f8b..b37c19a445d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93f210dd9e614ddab7ecef0b4c9ba6ad3720d860 +refs/heads/master: 04903664325acb3f199dd8a4b8f1aa437e9fd6b2 diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h index 31e9abb6d977..2275f2748708 100644 --- a/trunk/include/linux/bootmem.h +++ b/trunk/include/linux/bootmem.h @@ -119,8 +119,7 @@ extern void *alloc_large_system_hash(const char *tablename, unsigned int *_hash_mask, unsigned long limit); -#define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ -#define HASH_EARLY 0x00000002 /* Allocating during early boot? */ +#define HASH_EARLY 0x00000001 /* Allocating during early boot? */ /* Only NUMA needs hash distribution. * IA64 is known to have sufficient vmalloc space. diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d539f83c62b6..2273952300d4 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -3226,7 +3226,7 @@ void *__init alloc_large_system_hash(const char *tablename, /* allow the kernel cmdline to have a say */ if (!numentries) { /* round applicable memory size up to nearest megabyte */ - numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages; + numentries = nr_kernel_pages; numentries += (1UL << (20 - PAGE_SHIFT)) - 1; numentries >>= 20 - PAGE_SHIFT; numentries <<= 20 - PAGE_SHIFT;