git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
fixmap.h
diff --git
a/arch/x86/include/asm/fixmap.h
b/arch/x86/include/asm/fixmap.h
index
4729b2b
..
460c74e
100644
(file)
--- a/
arch/x86/include/asm/fixmap.h
+++ b/
arch/x86/include/asm/fixmap.h
@@
-78,6
+78,7
@@
enum fixed_addresses {
VSYSCALL_LAST_PAGE,
VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
+ ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
+ VVAR_PAGE,
VSYSCALL_HPET,
#endif
FIX_DBGP_BASE,