diff --git a/[refs] b/[refs] index 5c64b52c054c..2ceb8737d696 100644 --- 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 index b293ec1cc4e6..c53e9c8f6b4a 100644 --- 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