From: "tip-bot for H. Peter Anvin" <hpa@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
torvalds@linux-foundation.org, rdunlap@xenotime.net,
tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/vdso] x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c
Date: Tue, 16 Aug 2011 15:27:18 GMT [thread overview]
Message-ID: <tip-fab1167c4698e3ff11ebb06281d78def6c53728b@git.kernel.org> (raw)
In-Reply-To: <CA+55aFxsOMc9=p02r8-QhJ=h=Mqwckk4_Pnx9LQt5+fqMp_exQ@mail.gmail.com>
Commit-ID: fab1167c4698e3ff11ebb06281d78def6c53728b
Gitweb: http://git.kernel.org/tip/fab1167c4698e3ff11ebb06281d78def6c53728b
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: Tue, 16 Aug 2011 08:04:02 -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..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:
next prev parent reply other threads:[~2011-08-16 15:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-14 22:45 Linux 3.1-rc2 Linus Torvalds
2011-08-14 23:38 ` Linus Torvalds
2011-08-15 9:58 ` Paul Rolland
2011-08-15 17:18 ` [PATCH 3.1-rc2] x86: fix mm/fault.c build Randy Dunlap
2011-08-16 2:09 ` Linus Torvalds
2011-08-16 5:27 ` H. Peter Anvin
2011-08-16 6:00 ` Rule 1 (Was: Re: [PATCH 3.1-rc2] x86: fix mm/fault.c build) Stephen Rothwell
2011-08-16 6:20 ` [tip:x86/vdso] x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c tip-bot for H. Peter Anvin
2011-08-16 6:43 ` Pekka Enberg
2011-08-16 15:02 ` H. Peter Anvin
2011-08-16 15:27 ` tip-bot for H. Peter Anvin [this message]
2011-08-16 17:23 ` Randy Dunlap
2011-08-16 4:41 ` [PATCH 3.1-rc2] xen: self-balloon needs module.h Randy Dunlap
2011-08-16 5:11 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-fab1167c4698e3ff11ebb06281d78def6c53728b@git.kernel.org \
--to=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rdunlap@xenotime.net \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox