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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
vdso.c
diff --git
a/arch/powerpc/kernel/vdso.c
b/arch/powerpc/kernel/vdso.c
index
c913ad5
..
a4b28c7
100644
(file)
--- a/
arch/powerpc/kernel/vdso.c
+++ b/
arch/powerpc/kernel/vdso.c
@@
-264,7
+264,7
@@
int arch_setup_additional_pages(struct linux_binprm *bprm,
/* Allocate a VMA structure and fill it up */
- vma = kmem_cache_zalloc(vm_area_cachep,
SLAB
_KERNEL);
+ vma = kmem_cache_zalloc(vm_area_cachep,
GFP
_KERNEL);
if (vma == NULL) {
rc = -ENOMEM;
goto fail_mmapsem;