Skip to content

Commit

Permalink
[MIPS] setup.c: use __pa_symbol() where needed
Browse files Browse the repository at this point in the history
It should fix the broken code in resource_init() too.

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Franck Bui-Huu authored and Ralf Baechle committed Nov 30, 2006
1 parent 8431fd0 commit f5bffe3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/mips/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ static void __init bootmem_init(void)
* of usable memory.
*/
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.
Expand Down Expand Up @@ -432,10 +432,10 @@ static void __init resource_init(void)
if (UNCAC_BASE != IO_BASE)
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.
Expand Down

0 comments on commit f5bffe3

Please sign in to comment.