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 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
page_64_types.h
diff --git
a/arch/x86/include/asm/page_64_types.h
b/arch/x86/include/asm/page_64_types.h
index
8d382d3
..
7639dbf
100644
(file)
--- a/
arch/x86/include/asm/page_64_types.h
+++ b/
arch/x86/include/asm/page_64_types.h
@@
-41,7
+41,7
@@
/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
#define __PHYSICAL_MASK_SHIFT 46
-#define __VIRTUAL_MASK_SHIFT 4
8
+#define __VIRTUAL_MASK_SHIFT 4
7
/*
* Kernel image size is limited to 512 MB (see level2_kernel_pgt in