diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-08 20:47:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-08 20:47:26 +0200 |
| commit | d1895c31cce871bfbb68ae738230c3d987d5a9fb (patch) | |
| tree | 0d7c322e1047e2bd7ae626f578bd697f3e2cf756 /arch/x86/kernel/entry_64.S | |
| parent | 18172fdc9f55d971aae35fd69012d3126ca1f226 (diff) | |
| parent | 5cec93c216db77c45f7ce970d46283bcb1933884 (diff) | |
Merge branch 'x86/vdso' into auto-latest
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 0412bcbe171c..ed9d6f384c65 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -9,6 +9,8 @@ /* * entry.S contains the system-call and fault low-level handling routines. * + * Some of this is documented in Documentation/x86/entry_64.txt + * * NOTE: This code handles signal-recognition, which happens every time * after an interrupt and after each system call. * @@ -1121,6 +1123,8 @@ zeroentry spurious_interrupt_bug do_spurious_interrupt_bug zeroentry coprocessor_error do_coprocessor_error errorentry alignment_check do_alignment_check zeroentry simd_coprocessor_error do_simd_coprocessor_error +zeroentry emulate_vsyscall do_emulate_vsyscall + /* Reload gs selector with exception handling */ /* edi: new selector */ |