diff options
author | Franck Bui-Huu <vagabon.xyz@gmail.com> | 2006-10-19 07:20:03 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-11-29 20:14:41 -0500 |
commit | f5bffe3a9bcd6e5319b5fd3a8109625f8638425a (patch) | |
tree | ecbf09f2bbeef9326a0e53b88994ae358fbfcf79 | |
parent | 8431fd094d625b94d364fe393076ccef88e6ce18 (diff) |
[MIPS] setup.c: use __pa_symbol() where needed
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>
-rw-r--r-- | arch/mips/kernel/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 715451a9d5d6..b52cc9763763 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -260,7 +260,7 @@ static void __init bootmem_init(void) | |||
260 | * of usable memory. | 260 | * of usable memory. |
261 | */ | 261 | */ |
262 | reserved_end = init_initrd(); | 262 | reserved_end = init_initrd(); |
263 | reserved_end = PFN_UP(__pa(max(reserved_end, (unsigned long)&_end))); | 263 | reserved_end = PFN_UP(max(__pa(reserved_end), __pa_symbol(&_end))); |
264 | 264 | ||
265 | /* | 265 | /* |
266 | * Find the highest page frame number we have available. | 266 | * Find the highest page frame number we have available. |
@@ -432,10 +432,10 @@ static void __init resource_init(void) | |||
432 | if (UNCAC_BASE != IO_BASE) | 432 | if (UNCAC_BASE != IO_BASE) |
433 | return; | 433 | return; |
434 | 434 | ||
435 | code_resource.start = virt_to_phys(&_text); | 435 | code_resource.start = __pa_symbol(&_text); |
436 | code_resource.end = virt_to_phys(&_etext) - 1; | 436 | code_resource.end = __pa_symbol(&_etext) - 1; |
437 | data_resource.start = virt_to_phys(&_etext); | 437 | data_resource.start = __pa_symbol(&_etext); |
438 | data_resource.end = virt_to_phys(&_edata) - 1; | 438 | data_resource.end = __pa_symbol(&_edata) - 1; |
439 | 439 | ||
440 | /* | 440 | /* |
441 | * Request address space for all standard RAM. | 441 | * Request address space for all standard RAM. |