diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /arch/um/sys-i386/bugs.c | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/um/sys-i386/bugs.c')
| -rw-r--r-- | arch/um/sys-i386/bugs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c index a74442d13762..2c6d0d731c12 100644 --- a/arch/um/sys-i386/bugs.c +++ b/arch/um/sys-i386/bugs.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "sysdep/ptrace.h" | 12 | #include "sysdep/ptrace.h" |
| 13 | 13 | ||
| 14 | /* Set during early boot */ | 14 | /* Set during early boot */ |
| 15 | int host_has_cmov = 1; | 15 | static int host_has_cmov = 1; |
| 16 | static jmp_buf cmov_test_return; | 16 | static jmp_buf cmov_test_return; |
| 17 | 17 | ||
| 18 | static void cmov_sigill_test_handler(int sig) | 18 | static void cmov_sigill_test_handler(int sig) |