diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h index 611854f2..660aac9f 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h | |||
@@ -21,14 +21,11 @@ struct gk20a; | |||
21 | struct device; | 21 | struct device; |
22 | 22 | ||
23 | #ifdef CONFIG_NVGPU_TRACK_MEM_USAGE | 23 | #ifdef CONFIG_NVGPU_TRACK_MEM_USAGE |
24 | void *__nvgpu_track_vmalloc(struct gk20a *g, unsigned long size, | 24 | void *__nvgpu_track_vmalloc(struct gk20a *g, unsigned long size, void *ip); |
25 | unsigned long ip); | 25 | void *__nvgpu_track_vzalloc(struct gk20a *g, unsigned long size, void *ip); |
26 | void *__nvgpu_track_vzalloc(struct gk20a *g, unsigned long size, | 26 | void *__nvgpu_track_kmalloc(struct gk20a *g, size_t size, void *ip); |
27 | unsigned long ip); | 27 | void *__nvgpu_track_kzalloc(struct gk20a *g, size_t size, void *ip); |
28 | void *__nvgpu_track_kmalloc(struct gk20a *g, size_t size, unsigned long ip); | 28 | void *__nvgpu_track_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip); |
29 | void *__nvgpu_track_kzalloc(struct gk20a *g, size_t size, unsigned long ip); | ||
30 | void *__nvgpu_track_kcalloc(struct gk20a *g, size_t n, size_t size, | ||
31 | unsigned long ip); | ||
32 | void __nvgpu_track_vfree(struct gk20a *g, void *addr); | 29 | void __nvgpu_track_vfree(struct gk20a *g, void *addr); |
33 | void __nvgpu_track_kfree(struct gk20a *g, void *addr); | 30 | void __nvgpu_track_kfree(struct gk20a *g, void *addr); |
34 | #endif | 31 | #endif |
@@ -39,11 +36,11 @@ void __nvgpu_track_kfree(struct gk20a *g, void *addr); | |||
39 | * These are the Linux implementations of the various kmem functions defined by | 36 | * These are the Linux implementations of the various kmem functions defined by |
40 | * nvgpu. This should not be included directly - instead include <nvgpu/kmem.h>. | 37 | * nvgpu. This should not be included directly - instead include <nvgpu/kmem.h>. |
41 | */ | 38 | */ |
42 | void *__nvgpu_kmalloc(struct gk20a *g, size_t size, unsigned long ip); | 39 | void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip); |
43 | void *__nvgpu_kzalloc(struct gk20a *g, size_t size, unsigned long ip); | 40 | void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip); |
44 | void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, unsigned long ip); | 41 | void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip); |
45 | void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, unsigned long ip); | 42 | void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip); |
46 | void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, unsigned long ip); | 43 | void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip); |
47 | void __nvgpu_kfree(struct gk20a *g, void *addr); | 44 | void __nvgpu_kfree(struct gk20a *g, void *addr); |
48 | void __nvgpu_vfree(struct gk20a *g, void *addr); | 45 | void __nvgpu_vfree(struct gk20a *g, void *addr); |
49 | 46 | ||