diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-07-26 13:02:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-27 01:46:17 +0200 |
| commit | d8a1b2b94ca5fe219b3c77389e2424145c24c668 (patch) | |
| tree | ceeee085e688f6872b2dea354ce107a7b5050825 /arch/sparc/mm/srmmu.c | |
| parent | sparc32: drop unused BAD_PAGE stuff (diff) | |
| download | linux-d8a1b2b94ca5fe219b3c77389e2424145c24c668.tar.xz linux-d8a1b2b94ca5fe219b3c77389e2424145c24c668.zip | |
sparc32: move probe_memory() to srmmu.c
Only one user so move it to the file using it.
It had nothing to do in fault_32.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm/srmmu.c')
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index ad93d2ee6be2..c38bb72e3e80 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -228,7 +228,17 @@ void srmmu_free_nocache(void *addr, int size) static void srmmu_early_allocate_ptable_skeleton(unsigned long start, unsigned long end); -extern unsigned long probe_memory(void); /* in fault.c */ +/* Return how much physical memory we have. */ +static unsigned long __init probe_memory(void) +{ + unsigned long total = 0; + int i; + + for (i = 0; sp_banks[i].num_bytes; i++) + total += sp_banks[i].num_bytes; + + return total; +} /* * Reserve nocache dynamically proportionally to the amount of |