X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fvmalloc.c;h=1150229b636633ee02102d9b3caa966135570032;hb=974f7bc5781d3fc16e32d8908c6e48592e767dd2;hp=13c3d82968ae2a1e363dcc16e47474a716c5952d;hpb=2625c1be3425f5a9d8ef1434449b7d954aaf199d;p=mv-sheeva.git diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 13c3d82968a..1150229b636 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -395,7 +395,7 @@ void *vmap(struct page **pages, unsigned int count, EXPORT_SYMBOL(vmap); -void *__vmalloc_area(struct vm_struct *area, unsigned int __nocast gfp_mask, pgprot_t prot) +void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot) { struct page **pages; unsigned int nr_pages, array_size, i; @@ -446,7 +446,7 @@ fail: * allocator with @gfp_mask flags. Map them into contiguous * kernel virtual space, using a pagetable protection of @prot. */ -void *__vmalloc(unsigned long size, unsigned int __nocast gfp_mask, pgprot_t prot) +void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { struct vm_struct *area;