---

yaml --- r: 43074 b: refs/heads/master c: 3bbf547 h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · 032b969 · 032b969
1 parent 0916ee8
commit 032b969
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);