summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/setup.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-02 07:28:17 +0200
committerDavid S. Miller <davem@davemloft.net>2008-05-02 14:22:53 +0200
commit9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8 (patch)
tree2afd44efe02154ab1bfcbd47e1d8ba55167da4e5 /arch/sparc/kernel/setup.c
parentsparc32: Kill totally unused memory information tables. (diff)
downloadlinux-9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8.tar.xz
linux-9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8.zip
sparc32: More memory probing consolidation.
The PROM library function prom_meminit() builds a table, prom_phys_avail[], just so that probe_memory() in arch/sparc/mm/fault.c can copy it into sp_banks[]. Just have prom_meminit() fill in the sp_banks[] array directly, and remove duplicated sort() function. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/setup.c')
-rw-r--r--arch/sparc/kernel/setup.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index 3c13137685da..8a55c4f0df84 100644
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -180,11 +180,9 @@ static void __init boot_flags_init(char *commands)
/* This routine will in the future do all the nasty prom stuff
* to probe for the mmu type and its parameters, etc. This will
- * also be where SMP things happen plus the Sparc specific memory
- * physical memory probe as on the alpha.
+ * also be where SMP things happen.
*/
-extern int prom_probe_memory(void);
extern void sun4c_probe_vac(void);
extern char cputypval;
extern unsigned long start, end;
@@ -268,7 +266,6 @@ void __init setup_arch(char **cmdline_p)
if (ARCH_SUN4C_SUN4)
sun4c_probe_vac();
load_mmu();
- (void) prom_probe_memory();
phys_base = 0xffffffffUL;
highest_paddr = 0UL;