Revision e0e7e67b hw/pc.c

b/hw/pc.c
957 957
    }
958 958
}
959 959

  
960
void pc_memory_init(ram_addr_t ram_size,
961
                    const char *kernel_filename,
960
void pc_memory_init(const char *kernel_filename,
962 961
                    const char *kernel_cmdline,
963 962
                    const char *initrd_filename,
964
                    ram_addr_t *below_4g_mem_size_p,
965
                    ram_addr_t *above_4g_mem_size_p)
963
                    ram_addr_t below_4g_mem_size,
964
                    ram_addr_t above_4g_mem_size)
966 965
{
967 966
    char *filename;
968 967
    int ret, linux_boot, i;
969 968
    ram_addr_t ram_addr, bios_offset, option_rom_offset;
970
    ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
971 969
    int bios_size, isa_bios_size;
972 970
    void *fw_cfg;
973 971

  
974
    if (ram_size >= 0xe0000000 ) {
975
        above_4g_mem_size = ram_size - 0xe0000000;
976
        below_4g_mem_size = 0xe0000000;
977
    } else {
978
        below_4g_mem_size = ram_size;
979
    }
980
    *above_4g_mem_size_p = above_4g_mem_size;
981
    *below_4g_mem_size_p = below_4g_mem_size;
982

  
983 972
    linux_boot = (kernel_filename != NULL);
984 973

  
985 974
    /* allocate RAM */

Also available in: Unified diff