diff options
| author |   Huang Rui <ray.huang@amd.com> | 2021-09-07 18:03:02 +0800 |
|---|---|---|
| committer |   Christian König <christian.koenig@amd.com> | 2021-09-15 10:18:27 +0200 |
| commit | 282abb5a1f381d0ec10b20893961563be174a1c3 (patch) | |
| tree | 0b31fa1652601fdc53a67f46b82929ae309801c5 | |
| parent | drm/bochs: add Bochs PCI ID for Simics model (diff) | |
| download | linux-dev-282abb5a1f381d0ec10b20893961563be174a1c3.tar.xz linux-dev-282abb5a1f381d0ec10b20893961563be174a1c3.zip | |
drm/ttm: fix the type mismatch error on sparc64
__fls() on sparc64 return "int", but here it is expected as "unsigned
long" (x86). It will cause the build errors because the warning becomes
fatal while it is using sparc configuration. As suggested by Linus, it
can use min_t instead of min to force the type as "unsigned int".
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210907100302.3684453-1-ray.huang@amd.com
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_pool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index af1b41369626..c961a788b519 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -382,7 +382,8 @@ int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt, else gfp_flags |= GFP_HIGHUSER; - for (order = min(MAX_ORDER - 1UL, __fls(num_pages)); num_pages; + for (order = min_t(unsigned int, MAX_ORDER - 1, __fls(num_pages)); + num_pages; order = min_t(unsigned int, order, __fls(num_pages))) { bool apply_caching = false; struct ttm_pool_type *pt; |