]> err.no Git - linux-2.6/commitdiff
[PATCH] mm/nommu.c: try to fix __vmalloc
authorAdrian Bunk <bunk@stusta.de>
Tue, 17 May 2005 04:53:37 +0000 (21:53 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 17 May 2005 14:59:17 +0000 (07:59 -0700)
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>
mm/nommu.c

index b293ec1cc4e66879428684ef78afa0a313577528..c53e9c8f6b4adc98ac9fe69b1bc3526bba1baaa5 100644 (file)
@@ -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