diff mbox

drm/ttm: Fix unused variables with huge page support

Message ID 20171012112642.26350-1-tom.stdenis@amd.com (mailing list archive)
State New, archived
Headers show

Commit Message

StDenis, Tom Oct. 12, 2017, 11:26 a.m. UTC 
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/ttm/ttm_page_alloc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Christian König Oct. 12, 2017, 11:50 a.m. UTC | #1 
Am 12.10.2017 um 13:26 schrieb Tom St Denis:
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/ttm/ttm_page_alloc.c | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
> index b6f16e7ffff3..95022473704b 100644
> --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
> +++ b/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)
>   {
>   	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);
> +#endif
>   	unsigned long irq_flags;
>   	unsigned i;
>   
> @@ -825,7 +827,9 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
>   			 enum ttm_caching_state 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);
> +#endif
>   	struct list_head plist;
>   	struct page *p = NULL;
>   	unsigned count;
> @@ -834,7 +838,10 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
>   	/* No pool for cached pages */
>   	if (pool == NULL) {
>   		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 */
>   		if (flags & TTM_PAGE_FLAG_ZERO_ALLOC)
diff mbox

Patch

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b6f16e7ffff3..95022473704b 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/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)
 {
 	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);
+#endif
 	unsigned long irq_flags;
 	unsigned i;
 
@@ -825,7 +827,9 @@  static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
 			 enum ttm_caching_state 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);
+#endif
 	struct list_head plist;
 	struct page *p = NULL;
 	unsigned count;
@@ -834,7 +838,10 @@  static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
 	/* No pool for cached pages */
 	if (pool == NULL) {
 		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 */
 		if (flags & TTM_PAGE_FLAG_ZERO_ALLOC)