git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
mm
/
vmalloc.c
diff --git
a/mm/vmalloc.c
b/mm/vmalloc.c
index
94dff88
..
2aad499
100644
(file)
--- a/
mm/vmalloc.c
+++ b/
mm/vmalloc.c
@@
-1185,9
+1185,10
@@
void __init vmalloc_init(void)
/* Import existing vmlist entries. */
for (tmp = vmlist; tmp; tmp = tmp->next) {
va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);
/* Import existing vmlist entries. */
for (tmp = vmlist; tmp; tmp = tmp->next) {
va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);
- va->flags =
tmp->flags |
VM_VM_AREA;
+ va->flags = VM_VM_AREA;
va->va_start = (unsigned long)tmp->addr;
va->va_end = va->va_start + tmp->size;
va->va_start = (unsigned long)tmp->addr;
va->va_end = va->va_start + tmp->size;
+ va->vm = tmp;
__insert_vmap_area(va);
}
__insert_vmap_area(va);
}
@@
-2375,8
+2376,8
@@
struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
return NULL;
}
return NULL;
}
- vms = k
zalloc(sizeof(vms[0]) * nr_vms
, GFP_KERNEL);
- vas = k
zalloc(sizeof(vas[0]) * nr_vms
, GFP_KERNEL);
+ vms = k
calloc(nr_vms, sizeof(vms[0])
, GFP_KERNEL);
+ vas = k
calloc(nr_vms, sizeof(vas[0])
, GFP_KERNEL);
if (!vas || !vms)
goto err_free2;
if (!vas || !vms)
goto err_free2;