diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-12-06 20:37:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:37 -0800 |
| commit | 04903664325acb3f199dd8a4b8f1aa437e9fd6b2 (patch) | |
| tree | 6da8e4716c1477d578b9d89cd23be703aac8bedc | |
| parent | 93f210dd9e614ddab7ecef0b4c9ba6ad3720d860 (diff) | |
| download | op-kernel-dev-04903664325acb3f199dd8a4b8f1aa437e9fd6b2.zip op-kernel-dev-04903664325acb3f199dd8a4b8f1aa437e9fd6b2.tar.gz | |
[PATCH] remove HASH_HIGHMEM
It has no users and it's doubtful that we'll need it again.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/bootmem.h | 3 | ||||
| -rw-r--r-- | mm/page_alloc.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 31e9abb..2275f27 100644 --- a/include/linux/bootmem.h +++ b/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/mm/page_alloc.c b/mm/page_alloc.c index d539f83..2273952 100644 --- a/mm/page_alloc.c +++ b/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; |
