Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f83bd0de5eefe6314ebcfd78e9939c9f3bb27434..36642793e315fc8bb4b8682e5bf8f4dbe8f4ab7c 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -18,7 +18,8 @@
 #include <asm/traps.h>                 /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>               /* pgd_*(), ...                 */
 #include <asm/kmemcheck.h>             /* kmemcheck_*(), ...           */
-#include <asm/fixmap.h>                        /* VSYSCALL_START               */
+#include <asm/fixmap.h>                        /* VSYSCALL_ADDR                */
+#include <asm/vsyscall.h>              /* emulate_vsyscall             */
 
 #define CREATE_TRACE_POINTS
 #include <asm/trace/exceptions.h>
@@ -773,7 +774,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
                 * emulation.
                 */
                if (unlikely((error_code & PF_INSTR) &&
-                            ((address & ~0xfff) == VSYSCALL_START))) {
+                            ((address & ~0xfff) == VSYSCALL_ADDR))) {
                        if (emulate_vsyscall(regs, address))
                                return;
                }