diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/buddy_allocator.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/buddy_allocator.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c index b29045ba..3b8d9939 100644 --- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c | |||
@@ -1281,10 +1281,10 @@ static const struct nvgpu_allocator_ops buddy_ops = { | |||
1281 | * will try and pick a reasonable max order. | 1281 | * will try and pick a reasonable max order. |
1282 | * @flags: Extra flags necessary. See GPU_BALLOC_*. | 1282 | * @flags: Extra flags necessary. See GPU_BALLOC_*. |
1283 | */ | 1283 | */ |
1284 | int __nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *na, | 1284 | int nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *na, |
1285 | struct vm_gk20a *vm, const char *name, | 1285 | struct vm_gk20a *vm, const char *name, |
1286 | u64 base, u64 size, u64 blk_size, | 1286 | u64 base, u64 size, u64 blk_size, |
1287 | u64 max_order, u64 flags) | 1287 | u64 max_order, u64 flags) |
1288 | { | 1288 | { |
1289 | int err; | 1289 | int err; |
1290 | u64 pde_size; | 1290 | u64 pde_size; |
@@ -1312,7 +1312,7 @@ int __nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *na, | |||
1312 | return -ENOMEM; | 1312 | return -ENOMEM; |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | err = __nvgpu_alloc_common_init(na, g, name, a, false, &buddy_ops); | 1315 | err = nvgpu_alloc_common_init(na, g, name, a, false, &buddy_ops); |
1316 | if (err) { | 1316 | if (err) { |
1317 | goto fail; | 1317 | goto fail; |
1318 | } | 1318 | } |
@@ -1396,11 +1396,3 @@ fail: | |||
1396 | nvgpu_kfree(g, a); | 1396 | nvgpu_kfree(g, a); |
1397 | return err; | 1397 | return err; |
1398 | } | 1398 | } |
1399 | |||
1400 | int nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *na, | ||
1401 | const char *name, u64 base, u64 size, | ||
1402 | u64 blk_size, u64 flags) | ||
1403 | { | ||
1404 | return __nvgpu_buddy_allocator_init(g, na, NULL, name, | ||
1405 | base, size, blk_size, 0, 0); | ||
1406 | } | ||