Messages in this thread Patch in this message | | | Date | Wed, 26 Oct 2011 17:59:39 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/vdso changes for v3.2 |
| |
Linus,
Please pull the latest x86-vdso-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-vdso-for-linus
Thanks,
Ingo
------------------> Cesar Eduardo Barros (1): x86-64, doc: Remove int 0xcc from entry_64.S documentation
H. Peter Anvin (1): x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c
Documentation/x86/entry_64.txt | 3 --- arch/x86/mm/fault.c | 1 + 2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt index 7869f14..bc7226e 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 247aae3..f2d4c9d 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -17,6 +17,7 @@ #include <asm/traps.h> /* dotraplinkage, ... */ #include <asm/pgalloc.h> /* pgd_*(), ... */ #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ +#include <asm/fixmap.h> /* VSYSCALL_START */ /* * Page fault error code bits:
| |