diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 06:54:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 06:54:56 +0200 |
| commit | 2ad53110d654c7c9a80dcea341f4117246c1b6f9 (patch) | |
| tree | 90dac284bd4e08d408a0730fc507389779677b10 /arch | |
| parent | x86, mrst: use a temporary variable for SFI irq (diff) | |
| parent | x86: Default to vsyscall=native for now (diff) | |
| download | linux-2ad53110d654c7c9a80dcea341f4117246c1b6f9.tar.xz linux-2ad53110d654c7c9a80dcea341f4117246c1b6f9.zip | |
Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
* 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
x86: Default to vsyscall=native for now
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 18ae83dd1cd7..b56c65de384d 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -56,7 +56,7 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), }; -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE; +static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE; static int __init vsyscall_setup(char *str) { |