aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-02 01:28:17 -0400
committerDavid S. Miller <davem@davemloft.net>2008-05-02 08:22:53 -0400
commit9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8 (patch)
tree2afd44efe02154ab1bfcbd47e1d8ba55167da4e5 /include
parentccc34028d46230f715eeda4c8cce27e919934fad (diff)
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')
-rw-r--r--include/asm-sparc/oplib.h7
-rw-r--r--include/asm-sparc/page.h5
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);
84extern void prom_seek(int device_handle, unsigned int seek_hival, 84extern void prom_seek(int device_handle, unsigned int seek_hival,
85 unsigned int seek_lowval); 85 unsigned int seek_lowval);
86 86
87/* Machine memory configuration routine. */
88
89/* This function returns a V0 format available memory descriptor entry.
90 * This list is pre-sorted,
91 */
92extern struct linux_mlist_v0 *prom_meminfo(void);
93
94/* Miscellaneous routines, don't really fit in any category per se. */ 87/* Miscellaneous routines, don't really fit in any category per se. */
95 88
96/* Reboot the machine with the command line passed. */ 89/* 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 @@
38 38
39/* The following structure is used to hold the physical 39/* The following structure is used to hold the physical
40 * memory configuration of the machine. This is filled in 40 * memory configuration of the machine. This is filled in
41 * probe_memory() and is later used by mem_init() to set up 41 * prom_meminit() and is later used by mem_init() to set up
42 * mem_map[]. We statically allocate SPARC_PHYS_BANKS of 42 * mem_map[]. We statically allocate SPARC_PHYS_BANKS+1 of
43 * these structs, this is arbitrary. The entry after the 43 * these structs, this is arbitrary. The entry after the
44 * last valid one has num_bytes==0. 44 * last valid one has num_bytes==0.
45 */ 45 */
46
47struct sparc_phys_banks { 46struct sparc_phys_banks {
48 unsigned long base_addr; 47 unsigned long base_addr;
49 unsigned long num_bytes; 48 unsigned long num_bytes;