Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
core
/
ramht.c
diff --git
a/kernel/drivers/gpu/drm/nouveau/nvkm/core/ramht.c
b/kernel/drivers/gpu/drm/nouveau/nvkm/core/ramht.c
index
3216e15
..
89da472
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/nvkm/core/ramht.c
+++ b/
kernel/drivers/gpu/drm/nouveau/nvkm/core/ramht.c
@@
-131,7
+131,7
@@
nvkm_ramht_del(struct nvkm_ramht **pramht)
struct nvkm_ramht *ramht = *pramht;
if (ramht) {
nvkm_gpuobj_del(&ramht->gpuobj);
struct nvkm_ramht *ramht = *pramht;
if (ramht) {
nvkm_gpuobj_del(&ramht->gpuobj);
-
k
free(*pramht);
+
v
free(*pramht);
*pramht = NULL;
}
}
*pramht = NULL;
}
}
@@
-143,8
+143,8
@@
nvkm_ramht_new(struct nvkm_device *device, u32 size, u32 align,
struct nvkm_ramht *ramht;
int ret, i;
struct nvkm_ramht *ramht;
int ret, i;
- if (!(ramht = *pramht =
kzalloc(sizeof(*ramht) + (size >> 3) *
-
sizeof(*ramht->data), GFP_KERNEL
)))
+ if (!(ramht = *pramht =
vzalloc(sizeof(*ramht) +
+
(size >> 3) * sizeof(*ramht->data)
)))
return -ENOMEM;
ramht->device = device;
return -ENOMEM;
ramht->device = device;