From cce16f950491c5d734499efdfdf12b5df1c1f57d Mon Sep 17 00:00:00 2001 From: "Siddha, Suresh B" Date: Fri, 19 Oct 2007 20:35:02 +0200 Subject: [PATCH] --- yaml --- r: 71673 b: refs/heads/master c: 957ff882f9db86e017f730e77322ec5193178e5e h: refs/heads/master i: 71671: ea49a0dc4ecbea7a7edc082ef4d0e46bbe3a41e4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vsyscall_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4c9119326dd..3854c2f9484b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f322727b92957ccd4b0366dbd42908613222033a +refs/heads/master: 957ff882f9db86e017f730e77322ec5193178e5e diff --git a/trunk/arch/x86/kernel/vsyscall_64.c b/trunk/arch/x86/kernel/vsyscall_64.c index 585541ca1a7e..4a2c340ab0f3 100644 --- a/trunk/arch/x86/kernel/vsyscall_64.c +++ b/trunk/arch/x86/kernel/vsyscall_64.c @@ -48,7 +48,7 @@ ({unsigned long v; \ extern char __vsyscall_0; \ asm("" : "=r" (v) : "0" (x)); \ - ((v - VSYSCALL_FIRST_PAGE) + __pa_symbol(&__vsyscall_0)); }) + ((v - VSYSCALL_START) + __pa_symbol(&__vsyscall_0)); }) /* * vsyscall_gtod_data contains data that is :