Browse Source

drm/ttm: Fix unused variables with huge page support

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tom St Denis 7 years ago
parent
commit
7d0a42823b
1 changed files with 8 additions and 1 deletions
  1. 8 1
      drivers/gpu/drm/ttm/ttm_page_alloc.c

+ 8 - 1
drivers/gpu/drm/ttm/ttm_page_alloc.c

@@ -723,7 +723,9 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
 			  enum ttm_caching_state cstate)
 			  enum ttm_caching_state cstate)
 {
 {
 	struct ttm_page_pool *pool = ttm_get_pool(flags, false, cstate);
 	struct ttm_page_pool *pool = ttm_get_pool(flags, false, cstate);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	struct ttm_page_pool *huge = ttm_get_pool(flags, true, cstate);
 	struct ttm_page_pool *huge = ttm_get_pool(flags, true, cstate);
+#endif
 	unsigned long irq_flags;
 	unsigned long irq_flags;
 	unsigned i;
 	unsigned i;
 
 
@@ -825,7 +827,9 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
 			 enum ttm_caching_state cstate)
 			 enum ttm_caching_state cstate)
 {
 {
 	struct ttm_page_pool *pool = ttm_get_pool(flags, false, cstate);
 	struct ttm_page_pool *pool = ttm_get_pool(flags, false, cstate);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	struct ttm_page_pool *huge = ttm_get_pool(flags, true, cstate);
 	struct ttm_page_pool *huge = ttm_get_pool(flags, true, cstate);
+#endif
 	struct list_head plist;
 	struct list_head plist;
 	struct page *p = NULL;
 	struct page *p = NULL;
 	unsigned count;
 	unsigned count;
@@ -834,7 +838,10 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
 	/* No pool for cached pages */
 	/* No pool for cached pages */
 	if (pool == NULL) {
 	if (pool == NULL) {
 		gfp_t gfp_flags = GFP_USER;
 		gfp_t gfp_flags = GFP_USER;
-		unsigned i, j;
+		unsigned i;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+		unsigned j;
+#endif
 
 
 		/* set zero flag for page allocation if required */
 		/* set zero flag for page allocation if required */
 		if (flags & TTM_PAGE_FLAG_ZERO_ALLOC)
 		if (flags & TTM_PAGE_FLAG_ZERO_ALLOC)