aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/arch
diff options
context:
space:
mode:
authorTim Deegan <Tim.Deegan@xensource.com>2007-08-02 09:02:08 +0100
committerTim Deegan <Tim.Deegan@xensource.com>2007-08-02 09:02:08 +0100
commit5c0ffac838df120817e93dfe06574a5ffba522e2 (patch)
treee04d7063d52400a9f29515801f027c0ab94e7fb0 /extras/mini-os/arch
parentb1757490f0d13d1525e9d6a589188ddf4acafbbf (diff)
downloadxen-5c0ffac838df120817e93dfe06574a5ffba522e2.tar.gz
xen-5c0ffac838df120817e93dfe06574a5ffba522e2.tar.bz2
xen-5c0ffac838df120817e93dfe06574a5ffba522e2.zip
[MINIOS] fix x86_64 p2m map and CFLAGS
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
Diffstat (limited to 'extras/mini-os/arch')
-rw-r--r--extras/mini-os/arch/x86/Makefile3
-rw-r--r--extras/mini-os/arch/x86/mm.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile
index 10cb1ff9a1..22cfe82811 100644
--- a/extras/mini-os/arch/x86/Makefile
+++ b/extras/mini-os/arch/x86/Makefile
@@ -3,6 +3,9 @@
# It's is used for x86_32, x86_32y and x86_64
#
+XEN_ROOT = ../../../..
+include $(XEN_ROOT)/Config.mk
+
# include arch.mk has to be before mini-os.mk!
include arch.mk
diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c
index 15ed4877a8..8d4a8d42fb 100644
--- a/extras/mini-os/arch/x86/mm.c
+++ b/extras/mini-os/arch/x86/mm.c
@@ -405,9 +405,9 @@ void *map_frames(unsigned long *f, unsigned long n)
void arch_init_p2m(unsigned long max_pfn)
{
-#define L1_P2M_SHIFT 10
-#define L2_P2M_SHIFT 20
-#define L3_P2M_SHIFT 30
+#define L1_P2M_SHIFT 9
+#define L2_P2M_SHIFT 18
+#define L3_P2M_SHIFT 27
#define L1_P2M_ENTRIES (1 << L1_P2M_SHIFT)
#define L2_P2M_ENTRIES (1 << (L2_P2M_SHIFT - L1_P2M_SHIFT))
#define L3_P2M_ENTRIES (1 << (L3_P2M_SHIFT - L2_P2M_SHIFT))