Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index 4009115994683b6fe733d56a72589088c7ab6319..90e1861e2da0defa1a9b8514a9f781b8529a6197 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -30,7 +30,7 @@
 
 static mempool_t *page_pool, *isa_page_pool;
 
-static void *page_pool_alloc(unsigned int __nocast gfp_mask, void *data)
+static void *page_pool_alloc(gfp_t gfp_mask, void *data)
 {
        unsigned int gfp = gfp_mask | (unsigned int) (long) data;