Bladeren bron

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>
Sam Ravnborg 13 jaren geleden
bovenliggende
commit
d8a1b2b94c
2 gewijzigde bestanden met toevoegingen van 11 en 13 verwijderingen
  1. 0 12
      arch/sparc/mm/fault_32.c
  2. 11 1
      arch/sparc/mm/srmmu.c

+ 0 - 12
arch/sparc/mm/fault_32.c

@@ -32,18 +32,6 @@
 
 int show_unhandled_signals = 1;
 
-/* Return how much physical memory we have.  */
-unsigned long 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;
-}
-
 static void unhandled_fault(unsigned long, struct task_struct *,
 		struct pt_regs *) __attribute__ ((noreturn));
 

+ 11 - 1
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