diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | |
parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 6d54decef7f8..5652cc72ed3a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | |||
@@ -707,7 +707,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, | |||
707 | thread = (*pos & GENMASK_ULL(59, 52)) >> 52; | 707 | thread = (*pos & GENMASK_ULL(59, 52)) >> 52; |
708 | bank = (*pos & GENMASK_ULL(61, 60)) >> 60; | 708 | bank = (*pos & GENMASK_ULL(61, 60)) >> 60; |
709 | 709 | ||
710 | data = kmalloc_array(1024, sizeof(*data), GFP_KERNEL); | 710 | data = kcalloc(1024, sizeof(*data), GFP_KERNEL); |
711 | if (!data) | 711 | if (!data) |
712 | return -ENOMEM; | 712 | return -ENOMEM; |
713 | 713 | ||