[2.6.36-rc5] TTM fixes...

[Daniel J Blueman]

Correct allocation flags type and function prototype for ANSI C compliance.

Signed-off-by: Daniel J Blueman <daniel.blueman@xxxxxxxxx>
Reviewed-by: Alex Deucher <alexdeucher@xxxxxxxxx>

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c
b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index ca90479..b1e02ff 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -69,7 +69,7 @@ struct ttm_page_pool {
     spinlock_t        lock;
     bool            fill_lock;
     struct list_head    list;
-    int            gfp_flags;
+    gfp_t            gfp_flags;
     unsigned        npages;
     char            *name;
     unsigned long        nfrees;
@@ -475,7 +475,7 @@ static void
ttm_handle_caching_state_failure(struct list_head *pages,
  * This function is reentrant if caller updates count depending on number of
  * pages returned in pages array.
  */
-static int ttm_alloc_new_pages(struct list_head *pages, int gfp_flags,
+static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
         int ttm_flags, enum ttm_caching_state cstate, unsigned count)
 {
     struct page **caching_array;
@@ -666,7 +666,7 @@ int ttm_get_pages(struct list_head *pages, int flags,
 {
     struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);
     struct page *p = NULL;
-    int gfp_flags = GFP_USER;
+    gfp_t gfp_flags = GFP_USER;
     int r;

     /* set zero flag for page allocation if required */
@@ -818,7 +818,7 @@ int ttm_page_alloc_init(struct ttm_mem_global
*glob, unsigned max_pages)
     return 0;
 }

-void ttm_page_alloc_fini()
+void ttm_page_alloc_fini(void)
 {
     int i;
 --
Daniel J Blueman
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/