Merge tag 'amd-drm-next-6.7-2023-10-13' of https://gitlab.freedesktop.org/agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdkfd / kfd_svm.c

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index bff5512ae95281bca8c350beb6c7f84c8225089c..f4038b33c4042da0dbd6b5e9ad04307a6c19ad51 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -2706,10 +2706,7 @@ svm_range_get_range_boundaries(struct kfd_process *p, int64_t addr,
                return -EFAULT;
        }
 
-       *is_heap_stack = (vma->vm_start <= vma->vm_mm->brk &&
-                         vma->vm_end >= vma->vm_mm->start_brk) ||
-                        (vma->vm_start <= vma->vm_mm->start_stack &&
-                         vma->vm_end >= vma->vm_mm->start_stack);
+       *is_heap_stack = vma_is_initial_heap(vma) || vma_is_initial_stack(vma);
 
        start_limit = max(vma->vm_start >> PAGE_SHIFT,
                      (unsigned long)ALIGN_DOWN(addr, 2UL << 8));