From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 17 May 2005 04:53:37 +0000 (-0700)
Subject: [PATCH] mm/nommu.c: try to fix __vmalloc
X-Git-Tag: v2.6.12-rc5~136
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a019225c797a1047470accee950d69cfe7c59c5;p=linux-2.6

[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>
---

diff --git a/mm/nommu.c b/mm/nommu.c
index b293ec1cc4..c53e9c8f6b 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