diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /mm/nommu.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index b293ec1cc4e6..c53e9c8f6b4a 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -150,7 +150,8 @@ void vfree(void *addr) | |||
| 150 | kfree(addr); | 150 | kfree(addr); |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | void *__vmalloc(unsigned long size, int gfp_mask, pgprot_t prot) | 153 | void *__vmalloc(unsigned long size, unsigned int __nocast gfp_mask, |
| 154 | pgprot_t prot) | ||
| 154 | { | 155 | { |
| 155 | /* | 156 | /* |
| 156 | * kmalloc doesn't like __GFP_HIGHMEM for some reason | 157 | * kmalloc doesn't like __GFP_HIGHMEM for some reason |