diff options
author | David S. Miller | 2014-06-04 08:32:12 +0200 |
---|---|---|
committer | David S. Miller | 2014-06-04 08:32:12 +0200 |
commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/gpu/drm/radeon/radeon_vm.c | |
parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
parent | sh_eth: fix SH7619/771x support (diff) | |
download | kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.gz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_vm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c index d9ab99f47612..1f426696de36 100644 --- a/drivers/gpu/drm/radeon/radeon_vm.c +++ b/drivers/gpu/drm/radeon/radeon_vm.c @@ -130,10 +130,10 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, struct list_head *head) { struct radeon_cs_reloc *list; - unsigned i, idx, size; + unsigned i, idx; - size = (radeon_vm_num_pdes(rdev) + 1) * sizeof(struct radeon_cs_reloc); - list = kmalloc(size, GFP_KERNEL); + list = kmalloc_array(vm->max_pde_used + 1, + sizeof(struct radeon_cs_reloc), GFP_KERNEL); if (!list) return NULL; |