diff options
-rw-r--r-- | Documentation/x86/entry_64.txt | 3 | ||||
-rw-r--r-- | arch/x86/mm/fault.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt index 7869f14d055c..bc7226ef5055 100644 --- a/Documentation/x86/entry_64.txt +++ b/Documentation/x86/entry_64.txt | |||
@@ -27,9 +27,6 @@ Some of these entries are: | |||
27 | magically-generated functions that make their way to do_IRQ with | 27 | magically-generated functions that make their way to do_IRQ with |
28 | the interrupt number as a parameter. | 28 | the interrupt number as a parameter. |
29 | 29 | ||
30 | - emulate_vsyscall: int 0xcc, a special non-ABI entry used by | ||
31 | vsyscall emulation. | ||
32 | |||
33 | - APIC interrupts: Various special-purpose interrupts for things | 30 | - APIC interrupts: Various special-purpose interrupts for things |
34 | like TLB shootdown. | 31 | like TLB shootdown. |
35 | 32 | ||
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 9c7378df740a..5db0490deb07 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/traps.h> /* dotraplinkage, ... */ | 17 | #include <asm/traps.h> /* dotraplinkage, ... */ |
18 | #include <asm/pgalloc.h> /* pgd_*(), ... */ | 18 | #include <asm/pgalloc.h> /* pgd_*(), ... */ |
19 | #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ | 19 | #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ |
20 | #include <asm/vsyscall.h> | 20 | #include <asm/fixmap.h> /* VSYSCALL_START */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Page fault error code bits: | 23 | * Page fault error code bits: |