aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/e820.c
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-09-12 13:29:30 +0100
committerKeir Fraser <keir@xen.org>2012-09-12 13:29:30 +0100
commit5d1181a5ea5e0f11d481a94b16ed00d883f9726e (patch)
tree4b43be5829873f2ec1a1b2d0f7e26b15dffb11c6 /xen/arch/x86/e820.c
parentb314cd733413babc5978b819793ad5c77f094adf (diff)
downloadxen-5d1181a5ea5e0f11d481a94b16ed00d883f9726e.tar.gz
xen-5d1181a5ea5e0f11d481a94b16ed00d883f9726e.tar.bz2
xen-5d1181a5ea5e0f11d481a94b16ed00d883f9726e.zip
xen: Remove x86_32 build target.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/e820.c')
-rw-r--r--xen/arch/x86/e820.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c
index 1697e770c2..55fe0d6f1f 100644
--- a/xen/arch/x86/e820.c
+++ b/xen/arch/x86/e820.c
@@ -514,6 +514,7 @@ static void __init reserve_dmi_region(void)
static void __init machine_specific_memory_setup(
struct e820entry *raw, int *raw_nr)
{
+ unsigned long mpt_limit, ro_mpt_limit;
uint64_t top_of_ram, size;
int i;
@@ -536,25 +537,15 @@ static void __init machine_specific_memory_setup(
NULL);
}
-#ifdef __i386__
- clip_to_limit((1ULL << 30) * MACHPHYS_MBYTES,
- "Only the first %lu GB of the physical memory map "
- "can be accessed by Xen in 32-bit mode.");
-#else
- {
- unsigned long mpt_limit, ro_mpt_limit;
-
- mpt_limit = ((RDWR_MPT_VIRT_END - RDWR_MPT_VIRT_START)
- / sizeof(unsigned long)) << PAGE_SHIFT;
- ro_mpt_limit = ((RO_MPT_VIRT_END - RO_MPT_VIRT_START)
- / sizeof(unsigned long)) << PAGE_SHIFT;
- if ( mpt_limit > ro_mpt_limit )
- mpt_limit = ro_mpt_limit;
- clip_to_limit(mpt_limit,
- "Only the first %lu GB of the physical "
- "memory map can be accessed by Xen.");
- }
-#endif
+ mpt_limit = ((RDWR_MPT_VIRT_END - RDWR_MPT_VIRT_START)
+ / sizeof(unsigned long)) << PAGE_SHIFT;
+ ro_mpt_limit = ((RO_MPT_VIRT_END - RO_MPT_VIRT_START)
+ / sizeof(unsigned long)) << PAGE_SHIFT;
+ if ( mpt_limit > ro_mpt_limit )
+ mpt_limit = ro_mpt_limit;
+ clip_to_limit(mpt_limit,
+ "Only the first %lu GB of the physical "
+ "memory map can be accessed by Xen.");
reserve_dmi_region();