diff options
| author | Andi Kleen <ak@suse.de> | 2006-12-07 02:14:08 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:08 +0100 |
| commit | 3bbf54725467d604698721384d858b5983b87e8f (patch) | |
| tree | 1e30b98d550ca921ec40eb4b08481d9ffb97ba1f /arch/i386 | |
| parent | 4f205fd45a5c192907188d6f8f6d7e66db859248 (diff) | |
| download | linux-3bbf54725467d604698721384d858b5983b87e8f.tar.gz | |
[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>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/sysenter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c index 713ba39d32c6..92849c7def5a 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); |