summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-21 15:42:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-24 14:05:17 -0400
commitb3e1ce04b963e91b9b425b3c35cc4eff11db7543 (patch)
tree73c45d0acfe3ce25298ba1dc8dfa4777e02c861a /drivers/gpu/nvgpu/common/mm/lockless_allocator.c
parentb88c9ad793cb9822f359b8c498afe872c412959c (diff)
gpu: nvgpu: Put debugfs dependencies inside #ifdef
Put all debugfs dependencies inside #ifdef CONFIG_DEBUG_FS. This includes some functions in allocators that were used only for debugging. Remove include of linux/debugfs.h on files that do not deal with debugfs. linux/debugfs.h implicitly included linux/fs.h, which we relied on. Add explicit include of linux/fs.h for all files where this is the case. Change-Id: I16feffae6b0e3a2edf366075cdc01ade86be06f9 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1467897 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/lockless_allocator.c')
-rw-r--r--drivers/gpu/nvgpu/common/mm/lockless_allocator.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
index dc72d8bf..d8043c0b 100644
--- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU General Public License, 5 * under the terms and conditions of the GNU General Public License,
@@ -106,6 +106,7 @@ static void nvgpu_lockless_alloc_destroy(struct nvgpu_allocator *a)
106 nvgpu_kfree(nvgpu_alloc_to_gpu(a), pa); 106 nvgpu_kfree(nvgpu_alloc_to_gpu(a), pa);
107} 107}
108 108
109#ifdef CONFIG_DEBUG_FS
109static void nvgpu_lockless_print_stats(struct nvgpu_allocator *a, 110static void nvgpu_lockless_print_stats(struct nvgpu_allocator *a,
110 struct seq_file *s, int lock) 111 struct seq_file *s, int lock)
111{ 112{
@@ -122,6 +123,7 @@ static void nvgpu_lockless_print_stats(struct nvgpu_allocator *a,
122 __alloc_pstat(s, a, " Number free = %d\n", 123 __alloc_pstat(s, a, " Number free = %d\n",
123 pa->nr_nodes - atomic_read(&pa->nr_allocs)); 124 pa->nr_nodes - atomic_read(&pa->nr_allocs));
124} 125}
126#endif
125 127
126static const struct nvgpu_allocator_ops pool_ops = { 128static const struct nvgpu_allocator_ops pool_ops = {
127 .alloc = nvgpu_lockless_alloc, 129 .alloc = nvgpu_lockless_alloc,
@@ -134,7 +136,9 @@ static const struct nvgpu_allocator_ops pool_ops = {
134 136
135 .fini = nvgpu_lockless_alloc_destroy, 137 .fini = nvgpu_lockless_alloc_destroy,
136 138
139#ifdef CONFIG_DEBUG_FS
137 .print_stats = nvgpu_lockless_print_stats, 140 .print_stats = nvgpu_lockless_print_stats,
141#endif
138}; 142};
139 143
140int nvgpu_lockless_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a, 144int nvgpu_lockless_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,