diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /include/linux/bootmem.h | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
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. |