---

yaml --- r: 1155 b: refs/heads/master c: 7a01922 h: refs/heads/master i: 1153: 1f316ac 1151: 26252ed v: v3
git-mirror · May 17, 2005 · a792b82 · a792b82
1 parent ef66908
commit a792b82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59db2e6ed080ac385f19b9f4329133d634215bfd
+refs/heads/master: 7a019225c797a1047470accee950d69cfe7c59c5
diff --git a/trunk/mm/nommu.c b/trunk/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