diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 16:46:02 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 16:46:02 +0400 |
| commit | ca836a25435ef1b9914840ed0a310c9b6ac261d1 (patch) | |
| tree | 13c94f7e2fff14eb526608c2884b5faa3dab1f90 /arch | |
| parent | d630ba565f3d806d64df4415d4a8457b4ab23db6 (diff) | |
| parent | 664ef2123f4abc05857bf9b2dcccb800fa6fce26 (diff) | |
| download | linux-ca836a25435ef1b9914840ed0a310c9b6ac261d1.tar.xz | |
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..)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ #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: |