diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/linux/bootmem.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/bootmem.h')
| -rw-r--r-- | include/linux/bootmem.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 31e9abb6d977..2275f2748708 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -119,8 +119,7 @@ extern void *alloc_large_system_hash(const char *tablename, | |||
| 119 | unsigned int *_hash_mask, | 119 | unsigned int *_hash_mask, |
| 120 | unsigned long limit); | 120 | unsigned long limit); |
| 121 | 121 | ||
| 122 | #define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ | 122 | #define HASH_EARLY 0x00000001 /* Allocating during early boot? */ |
| 123 | #define HASH_EARLY 0x00000002 /* Allocating during early boot? */ | ||
| 124 | 123 | ||
| 125 | /* Only NUMA needs hash distribution. | 124 | /* Only NUMA needs hash distribution. |
| 126 | * IA64 is known to have sufficient vmalloc space. | 125 | * IA64 is known to have sufficient vmalloc space. |