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
/
i386
/
kernel
/
sysenter.c
diff --git
a/arch/i386/kernel/sysenter.c
b/arch/i386/kernel/sysenter.c
index
713ba39
..
7de9117
100644
(file)
--- a/
arch/i386/kernel/sysenter.c
+++ b/
arch/i386/kernel/sysenter.c
@@
-27,7
+27,11
@@
* Should the kernel map a VDSO page into processes and pass its
* address down to glibc upon exec()?
*/
* Should the kernel map a VDSO page into processes and pass its
* address down to glibc upon exec()?
*/
+#ifdef CONFIG_PARAVIRT
+unsigned int __read_mostly vdso_enabled = 0;
+#else
unsigned int __read_mostly vdso_enabled = 1;
unsigned int __read_mostly vdso_enabled = 1;
+#endif
EXPORT_SYMBOL_GPL(vdso_enabled);
EXPORT_SYMBOL_GPL(vdso_enabled);
@@
-132,7
+136,7
@@
int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
goto up_fail;
}
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;
if (!vma) {
ret = -ENOMEM;
goto up_fail;