From: Andi Kleen <ak@suse.de>
Date: Thu, 7 Dec 2006 01:14:08 +0000 (+0100)
Subject: [PATCH] paravirt: Disable vdso by default when CONFIG_PARAVIRT is enabled
X-Git-Tag: v2.6.20-rc1~145^2^2~8^2~72
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbf54725467d604698721384d858b5983b87e8f;p=linux-2.6

[PATCH] paravirt: Disable vdso by default when CONFIG_PARAVIRT is enabled

They don't work together and this way even glibc still works.

Signed-off-by: Andi Kleen <ak@suse.de>
---

diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c
index 713ba39d32..92849c7def 100644
--- 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()?
  */
+#ifdef CONFIG_PARAVIRT
+unsigned int __read_mostly vdso_enabled = 0;
+#else
 unsigned int __read_mostly vdso_enabled = 1;
+#endif
 
 EXPORT_SYMBOL_GPL(vdso_enabled);