summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-28 05:46:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-28 05:46:02 -0700
commitca836a25435ef1b9914840ed0a310c9b6ac261d1 (patch)
tree13c94f7e2fff14eb526608c2884b5faa3dab1f90
parentd630ba565f3d806d64df4415d4a8457b4ab23db6 (diff)
parent664ef2123f4abc05857bf9b2dcccb800fa6fce26 (diff)
downloadlinux-3.10-ca836a25435ef1b9914840ed0a310c9b6ac261d1.tar.gz
linux-3.10-ca836a25435ef1b9914840ed0a310c9b6ac261d1.tar.bz2
linux-3.10-ca836a25435ef1b9914840ed0a310c9b6ac261d1.zip
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86-64, doc: Remove int 0xcc from entry_64.S documentation x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c Fix up trivial conflicts in arch/x86/mm/fault.c (asm/fixmap.h vs asm/vsyscall.h: both work, which to use? Whatever..)
-rw-r--r--Documentation/x86/entry_64.txt3
-rw-r--r--arch/x86/mm/fault.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt
index 7869f14d055..bc7226ef505 100644
--- a/Documentation/x86/entry_64.txt
+++ b/Documentation/x86/entry_64.txt
@@ -27,9 +27,6 @@ Some of these entries are:
magically-generated functions that make their way to do_IRQ with
the interrupt number as a parameter.
- - emulate_vsyscall: int 0xcc, a special non-ABI entry used by
- vsyscall emulation.
-
- APIC interrupts: Various special-purpose interrupts for things
like TLB shootdown.
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9c7378df740..5db0490deb0 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -17,7 +17,7 @@
#include <asm/traps.h> /* dotraplinkage, ... */
#include <asm/pgalloc.h> /* pgd_*(), ... */
#include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
-#include <asm/vsyscall.h>
+#include <asm/fixmap.h> /* VSYSCALL_START */
/*
* Page fault error code bits: