diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/buddy_allocator.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/buddy_allocator.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c index 365f3b7b..f8c97839 100644 --- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c | |||
@@ -142,7 +142,7 @@ static void __balloc_buddy_list_add(struct nvgpu_buddy_allocator *a, | |||
142 | * without cycling through the entire list. | 142 | * without cycling through the entire list. |
143 | */ | 143 | */ |
144 | if (a->flags & GPU_ALLOC_GVA_SPACE && | 144 | if (a->flags & GPU_ALLOC_GVA_SPACE && |
145 | b->pte_size == gmmu_page_size_big) { | 145 | b->pte_size == GMMU_PAGE_SIZE_BIG) { |
146 | nvgpu_list_add_tail(&b->buddy_entry, list); | 146 | nvgpu_list_add_tail(&b->buddy_entry, list); |
147 | } else { | 147 | } else { |
148 | nvgpu_list_add(&b->buddy_entry, list); | 148 | nvgpu_list_add(&b->buddy_entry, list); |
@@ -487,7 +487,7 @@ static struct nvgpu_buddy *__balloc_find_buddy(struct nvgpu_buddy_allocator *a, | |||
487 | } | 487 | } |
488 | 488 | ||
489 | if (a->flags & GPU_ALLOC_GVA_SPACE && | 489 | if (a->flags & GPU_ALLOC_GVA_SPACE && |
490 | pte_size == gmmu_page_size_big) { | 490 | pte_size == GMMU_PAGE_SIZE_BIG) { |
491 | bud = nvgpu_list_last_entry(balloc_get_order_list(a, order), | 491 | bud = nvgpu_list_last_entry(balloc_get_order_list(a, order), |
492 | nvgpu_buddy, buddy_entry); | 492 | nvgpu_buddy, buddy_entry); |
493 | } else { | 493 | } else { |
@@ -844,8 +844,8 @@ static u64 nvgpu_buddy_balloc(struct nvgpu_allocator *__a, u64 len) | |||
844 | alloc_dbg(balloc_owner(a), | 844 | alloc_dbg(balloc_owner(a), |
845 | "Alloc 0x%-10llx %3lld:0x%-10llx pte_size=%s", | 845 | "Alloc 0x%-10llx %3lld:0x%-10llx pte_size=%s", |
846 | addr, order, len, | 846 | addr, order, len, |
847 | pte_size == gmmu_page_size_big ? "big" : | 847 | pte_size == GMMU_PAGE_SIZE_BIG ? "big" : |
848 | pte_size == gmmu_page_size_small ? "small" : | 848 | pte_size == GMMU_PAGE_SIZE_SMALL ? "small" : |
849 | "NA/any"); | 849 | "NA/any"); |
850 | } else { | 850 | } else { |
851 | alloc_dbg(balloc_owner(a), "Alloc failed: no mem!"); | 851 | alloc_dbg(balloc_owner(a), "Alloc failed: no mem!"); |
@@ -882,9 +882,9 @@ static u64 __nvgpu_balloc_fixed_buddy(struct nvgpu_allocator *__a, | |||
882 | /* Check that the page size is valid. */ | 882 | /* Check that the page size is valid. */ |
883 | if (a->flags & GPU_ALLOC_GVA_SPACE && a->vm->big_pages) { | 883 | if (a->flags & GPU_ALLOC_GVA_SPACE && a->vm->big_pages) { |
884 | if (page_size == a->vm->big_page_size) { | 884 | if (page_size == a->vm->big_page_size) { |
885 | pte_size = gmmu_page_size_big; | 885 | pte_size = GMMU_PAGE_SIZE_BIG; |
886 | } else if (page_size == SZ_4K) { | 886 | } else if (page_size == SZ_4K) { |
887 | pte_size = gmmu_page_size_small; | 887 | pte_size = GMMU_PAGE_SIZE_SMALL; |
888 | } else { | 888 | } else { |
889 | goto fail; | 889 | goto fail; |
890 | } | 890 | } |