pc: remove test on TARGET_PHYS_ADDR_BITS == 32
authorAurelien Jarno <aurelien@aurel32.net>
Wed, 9 Feb 2011 18:35:51 +0000 (19:35 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Sun, 20 Feb 2011 14:13:59 +0000 (15:13 +0100)
Both i386 and x86_64 targets are now using target_phys_bits=64. Remove
useless code.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
hw/pc.c

diff --git a/hw/pc.c b/hw/pc.c
index 3d7e036c60aab63370521b9357c4bca99704c798..5966bf1c2c10fd106a1efbeea67cfa5f767162aa 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -980,11 +980,6 @@ void pc_memory_init(ram_addr_t ram_size,
     *above_4g_mem_size_p = above_4g_mem_size;
     *below_4g_mem_size_p = below_4g_mem_size;
 
-#if TARGET_PHYS_ADDR_BITS == 32
-    if (above_4g_mem_size > 0) {
-        hw_error("To much RAM for 32-bit physical address");
-    }
-#endif
     linux_boot = (kernel_filename != NULL);
 
     /* allocate RAM */
@@ -994,12 +989,10 @@ void pc_memory_init(ram_addr_t ram_size,
     cpu_register_physical_memory(0x100000,
                  below_4g_mem_size - 0x100000,
                  ram_addr + 0x100000);
-#if TARGET_PHYS_ADDR_BITS > 32
     if (above_4g_mem_size > 0) {
         cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size,
                                      ram_addr + below_4g_mem_size);
     }
-#endif
 
     /* BIOS load */
     if (bios_name == NULL)