diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-05-16 21:53:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:17 -0700 |
| commit | 7a019225c797a1047470accee950d69cfe7c59c5 (patch) | |
| tree | 0292277ce6b1fda86658dbaeeb4402800c2bef0f /mm | |
| parent | 59db2e6ed080ac385f19b9f4329133d634215bfd (diff) | |
| download | linux-3.10-7a019225c797a1047470accee950d69cfe7c59c5.tar.gz linux-3.10-7a019225c797a1047470accee950d69cfe7c59c5.tar.bz2 linux-3.10-7a019225c797a1047470accee950d69cfe7c59c5.zip | |
[PATCH] mm/nommu.c: try to fix __vmalloc
Linus changed the second argument of __vmalloc from int to unsigned int
breaking the compilation for CONFIG_MMU=n configurations (since he only
changed vmalloc.c but not nommu.c).
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -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 b293ec1cc4e..c53e9c8f6b4 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -150,7 +150,8 @@ void vfree(void *addr) kfree(addr); } -void *__vmalloc(unsigned long size, int gfp_mask, pgprot_t prot) +void *__vmalloc(unsigned long size, unsigned int __nocast gfp_mask, + pgprot_t prot) { /* * kmalloc doesn't like __GFP_HIGHMEM for some reason |