projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
vsyscall.c
diff --git
a/arch/x86_64/kernel/vsyscall.c
b/arch/x86_64/kernel/vsyscall.c
index
3785e49
..
4a673f5
100644
(file)
--- a/
arch/x86_64/kernel/vsyscall.c
+++ b/
arch/x86_64/kernel/vsyscall.c
@@
-289,6
+289,7
@@
static void __init map_vsyscall(void)
extern char __vsyscall_0;
unsigned long physaddr_page0 = __pa_symbol(&__vsyscall_0);
+ /* Note that VSYSCALL_MAPPED_PAGES must agree with the code below. */
__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
}