Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca836a25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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..)
parents d630ba56 664ef212

Documentation/x86/entry_64.txt

+0 −3
Original line number Diff line number Diff line
@@ -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.

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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: