summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/mm/page_allocator.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2018-09-05 18:28:05 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-12 20:48:11 -0400
commit338500c8e2ee342612d7bc4eb1cd87850228d4e2 (patch)
tree55f607de797b24577fb03158c33738322b54e100 /drivers/gpu/nvgpu/common/mm/page_allocator.c
parent19434a22454778a14cd918ad6a0ec061634a1fc2 (diff)
gpu: nvgpu: Fix MISRA 21.2 violations (public allocator APIs)
MISRA 21.2 states that we may not use reserved identifiers; since all identifiers beginning with '_' are reserved by libc, the usage of '__' as a prefix is disallowed. This fixes places in the public allocator APIs. This consists of the various init routines which are used to create an allocator and the debug macro used within the allocator code. The buddy allocator was handled by collapsing the internal '__' prepended version with the non-prefixed version. The only required change was in the page_allocator code which now had to pass in a NULL vm pointer (since the VM is not needed for managing VIDMEM). JIRA NVGPU-1029 Change-Id: I484a144e61789bf594c525c1ca307b96d120830f Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1813578 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/page_allocator.c')
-rw-r--r--drivers/gpu/nvgpu/common/mm/page_allocator.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/page_allocator.c b/drivers/gpu/nvgpu/common/mm/page_allocator.c
index e559cb60..c8bc17c7 100644
--- a/drivers/gpu/nvgpu/common/mm/page_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/page_allocator.c
@@ -1022,7 +1022,7 @@ int nvgpu_page_allocator_init(struct gk20a *g, struct nvgpu_allocator *na,
1022 return -ENOMEM; 1022 return -ENOMEM;
1023 } 1023 }
1024 1024
1025 err = __nvgpu_alloc_common_init(na, g, name, a, false, &page_ops); 1025 err = nvgpu_alloc_common_init(na, g, name, a, false, &page_ops);
1026 if (err) { 1026 if (err) {
1027 goto fail; 1027 goto fail;
1028 } 1028 }
@@ -1053,8 +1053,9 @@ int nvgpu_page_allocator_init(struct gk20a *g, struct nvgpu_allocator *na,
1053 1053
1054 snprintf(buddy_name, sizeof(buddy_name), "%s-src", name); 1054 snprintf(buddy_name, sizeof(buddy_name), "%s-src", name);
1055 1055
1056 err = nvgpu_buddy_allocator_init(g, &a->source_allocator, buddy_name, 1056 err = nvgpu_buddy_allocator_init(g, &a->source_allocator, NULL,
1057 base, length, blk_size, 0); 1057 buddy_name, base, length, blk_size,
1058 0ULL, 0ULL);
1058 if (err) { 1059 if (err) {
1059 goto fail; 1060 goto fail;
1060 } 1061 }