aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-29 00:38:08 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-29 00:38:08 -0400
commit0836a0eb4073c3e0a09c5965833b9dec19f5abc7 (patch)
treed6538773d4bdc18a32e49c11e35138465f7739a1 /arch/sparc64/kernel
parent801ab3c731e77324c055769491711e620100dbfb (diff)
[SPARC64]: Move phys_base, kern_{base,size}, and sp_banks[] init to paging_init
Also, move prom_probe_memory() into arch/sparc64/mm/init.c Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r--arch/sparc64/kernel/setup.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 516f4854955f..4c9c8f241748 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -464,8 +464,6 @@ static void __init boot_flags_init(char *commands)
464 } 464 }
465} 465}
466 466
467extern int prom_probe_memory(void);
468extern unsigned long start, end;
469extern void panic_setup(char *, int *); 467extern void panic_setup(char *, int *);
470 468
471extern unsigned short root_flags; 469extern unsigned short root_flags;
@@ -494,8 +492,6 @@ void register_prom_callbacks(void)
494 492
495void __init setup_arch(char **cmdline_p) 493void __init setup_arch(char **cmdline_p)
496{ 494{
497 int i;
498
499 /* Initialize PROM console and command line. */ 495 /* Initialize PROM console and command line. */
500 *cmdline_p = prom_getbootargs(); 496 *cmdline_p = prom_getbootargs();
501 strcpy(saved_command_line, *cmdline_p); 497 strcpy(saved_command_line, *cmdline_p);
@@ -514,21 +510,6 @@ void __init setup_arch(char **cmdline_p)
514 boot_flags_init(*cmdline_p); 510 boot_flags_init(*cmdline_p);
515 511
516 idprom_init(); 512 idprom_init();
517 (void) prom_probe_memory();
518
519 phys_base = 0xffffffffffffffffUL;
520 for (i = 0; sp_banks[i].num_bytes != 0; i++) {
521 unsigned long top;
522
523 if (sp_banks[i].base_addr < phys_base)
524 phys_base = sp_banks[i].base_addr;
525 top = sp_banks[i].base_addr +
526 sp_banks[i].num_bytes;
527 }
528 pfn_base = phys_base >> PAGE_SHIFT;
529
530 kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
531 kern_size = (unsigned long)&_end - (unsigned long)KERNBASE;
532 513
533 if (!root_flags) 514 if (!root_flags)
534 root_mountflags &= ~MS_RDONLY; 515 root_mountflags &= ~MS_RDONLY;