diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 00:54:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 00:54:56 -0400 |
| commit | 2ad53110d654c7c9a80dcea341f4117246c1b6f9 (patch) | |
| tree | 90dac284bd4e08d408a0730fc507389779677b10 /arch | |
| parent | 153b19a3b9fd8b9478495b9ee1f93f6a77c564f9 (diff) | |
| parent | 2b666859ec323403ac9a3a441d16eab30945404b (diff) | |
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) = | |||
| 56 | .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), | 56 | .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE; | 59 | static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE; |
| 60 | 60 | ||
| 61 | static int __init vsyscall_setup(char *str) | 61 | static int __init vsyscall_setup(char *str) |
| 62 | { | 62 | { |