|
@@ -260,7 +260,7 @@ static void __init bootmem_init(void)
|
|
* of usable memory.
|
|
* of usable memory.
|
|
*/
|
|
*/
|
|
reserved_end = init_initrd();
|
|
reserved_end = init_initrd();
|
|
- reserved_end = PFN_UP(__pa(max(reserved_end, (unsigned long)&_end)));
|
|
|
|
|
|
+ reserved_end = PFN_UP(max(__pa(reserved_end), __pa_symbol(&_end)));
|
|
|
|
|
|
/*
|
|
/*
|
|
* Find the highest page frame number we have available.
|
|
* Find the highest page frame number we have available.
|
|
@@ -432,10 +432,10 @@ static void __init resource_init(void)
|
|
if (UNCAC_BASE != IO_BASE)
|
|
if (UNCAC_BASE != IO_BASE)
|
|
return;
|
|
return;
|
|
|
|
|
|
- code_resource.start = virt_to_phys(&_text);
|
|
|
|
- code_resource.end = virt_to_phys(&_etext) - 1;
|
|
|
|
- data_resource.start = virt_to_phys(&_etext);
|
|
|
|
- data_resource.end = virt_to_phys(&_edata) - 1;
|
|
|
|
|
|
+ code_resource.start = __pa_symbol(&_text);
|
|
|
|
+ code_resource.end = __pa_symbol(&_etext) - 1;
|
|
|
|
+ data_resource.start = __pa_symbol(&_etext);
|
|
|
|
+ data_resource.end = __pa_symbol(&_edata) - 1;
|
|
|
|
|
|
/*
|
|
/*
|
|
* Request address space for all standard RAM.
|
|
* Request address space for all standard RAM.
|