Messages in this thread Patch in this message | | | Date | Tue, 16 Aug 2011 06:20:43 GMT | From | "tip-bot for H. Peter Anvin" <> | Subject | [tip:x86/vdso] x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c |
| |
Commit-ID: 87cae8456a55c0a6163deca66d8aa3a6aa21f764 Gitweb: http://git.kernel.org/tip/87cae8456a55c0a6163deca66d8aa3a6aa21f764 Author: H. Peter Anvin <hpa@linux.intel.com> AuthorDate: Mon, 15 Aug 2011 22:28:56 -0700 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Mon, 15 Aug 2011 22:28:56 -0700
x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c
arch/x86/mm/fault.c now depend on having the symbol VSYSCALL_START defined, which is best handled by including <asm/fixmap.h> (it isn't unreasonable we may want other fixed addresses in this file in the future, and so it is cleaner than including <asm/vsyscall.h> directly.)
This addresses an x86-64 allnoconfig build failure. On other configurations it was masked by an indirect path:
<asm/smp.h> -> <asm/apic.h> -> <asm/fixmap.h> -> <asm/vsyscall.h>
... however, the first such include is conditional on CONFIG_X86_LOCAL_APIC.
Originally-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/CA%2B55aFxsOMc9=p02r8-QhJ=h=Mqwckk4_Pnx9LQt5%2BfqMp_exQ@mail.gmail.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- arch/x86/mm/fault.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 247aae3..bb3f8ca 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/vsyscall.h> /* VSYSCALL_START */ /* * Page fault error code bits:
| |