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 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
vsyscall
/
vsyscall.c
diff --git
a/arch/sh/kernel/vsyscall/vsyscall.c
b/arch/sh/kernel/vsyscall/vsyscall.c
index
075d6cc
..
deb4694
100644
(file)
--- a/
arch/sh/kernel/vsyscall/vsyscall.c
+++ b/
arch/sh/kernel/vsyscall/vsyscall.c
@@
-97,7
+97,7
@@
int arch_setup_additional_pages(struct linux_binprm *bprm,
goto up_fail;
}
- vma = kmem_cache_zalloc(vm_area_cachep,
SLAB
_KERNEL);
+ vma = kmem_cache_zalloc(vm_area_cachep,
GFP
_KERNEL);
if (!vma) {
ret = -ENOMEM;
goto up_fail;