From 032b969ed2ca2fb0198c9609e4ae01065bbef40b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 7 Dec 2006 02:14:08 +0100
Subject: [PATCH] --- yaml --- r: 43074 b: refs/heads/master c:
 3bbf54725467d604698721384d858b5983b87e8f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/i386/kernel/sysenter.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 253fd6d93c67..68f86daa9e22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f205fd45a5c192907188d6f8f6d7e66db859248
+refs/heads/master: 3bbf54725467d604698721384d858b5983b87e8f
diff --git a/trunk/arch/i386/kernel/sysenter.c b/trunk/arch/i386/kernel/sysenter.c
index 713ba39d32c6..92849c7def5a 100644
--- a/trunk/arch/i386/kernel/sysenter.c
+++ b/trunk/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);