diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-02 09:28:17 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-02 16:22:53 +0400 |
| commit | 9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8 (patch) | |
| tree | 2afd44efe02154ab1bfcbd47e1d8ba55167da4e5 /include/asm-sparc | |
| parent | ccc34028d46230f715eeda4c8cce27e919934fad (diff) | |
| download | linux-9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8.tar.xz | |
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 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/oplib.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc/page.h | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/asm-sparc/oplib.h b/include/asm-sparc/oplib.h index 6ff1a3bb15bc..22dc39d97b4e 100644 --- a/include/asm-sparc/oplib.h +++ b/include/asm-sparc/oplib.h @@ -84,13 +84,6 @@ extern int prom_devclose(int device_handle); extern void prom_seek(int device_handle, unsigned int seek_hival, unsigned int seek_lowval); -/* Machine memory configuration routine. */ - -/* This function returns a V0 format available memory descriptor entry. - * This list is pre-sorted, - */ -extern struct linux_mlist_v0 *prom_meminfo(void); - /* Miscellaneous routines, don't really fit in any category per se. */ /* Reboot the machine with the command line passed. */ diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index 39ccf2da297c..1625a8c3e0d2 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h @@ -38,12 +38,11 @@ /* The following structure is used to hold the physical * memory configuration of the machine. This is filled in - * probe_memory() and is later used by mem_init() to set up - * mem_map[]. We statically allocate SPARC_PHYS_BANKS of + * prom_meminit() and is later used by mem_init() to set up + * mem_map[]. We statically allocate SPARC_PHYS_BANKS+1 of * these structs, this is arbitrary. The entry after the * last valid one has num_bytes==0. */ - struct sparc_phys_banks { unsigned long base_addr; unsigned long num_bytes; |