diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2007-08-12 14:50:02 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@hp.com> | 2007-08-12 14:50:02 -0600 |
| commit | 087b48842b5c7dc771e91cfcd92332b2d75f88aa (patch) | |
| tree | a597266b53b30ee6062c2792f5793e68c9ff807f /extras/mini-os/arch | |
| parent | d3121a2b33156a4257f2e10426ae500d225881ca (diff) | |
| parent | c0efd4c9393885bfa80d1511d152aaed4202c3be (diff) | |
| download | xen-087b48842b5c7dc771e91cfcd92332b2d75f88aa.tar.gz xen-087b48842b5c7dc771e91cfcd92332b2d75f88aa.tar.bz2 xen-087b48842b5c7dc771e91cfcd92332b2d75f88aa.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'extras/mini-os/arch')
| -rw-r--r-- | extras/mini-os/arch/x86/Makefile | 3 | ||||
| -rw-r--r-- | extras/mini-os/arch/x86/mm.c | 6 |
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)) |