From 84da9785987504edd0b7e27893c5b4c9ceedbf78 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 26 Jul 2012 11:02:26 +0000 Subject: [PATCH] --- yaml --- r: 318955 b: refs/heads/master c: d8a1b2b94ca5fe219b3c77389e2424145c24c668 h: refs/heads/master i: 318953: ced77b5821173410b884eaa8e888112a8a8edf03 318951: b0263e4c2230fb399cf31132049bf269e8903cf7 v: v3 --- [refs] | 2 +- trunk/arch/sparc/mm/fault_32.c | 12 ------------ trunk/arch/sparc/mm/srmmu.c | 12 +++++++++++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index fce282c826d6..f0b1f08ca12a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2acdf2cefe8065a35844566bf996628fbcc9e014 +refs/heads/master: d8a1b2b94ca5fe219b3c77389e2424145c24c668 diff --git a/trunk/arch/sparc/mm/fault_32.c b/trunk/arch/sparc/mm/fault_32.c index e58f9ee718cb..77ac917be152 100644 --- a/trunk/arch/sparc/mm/fault_32.c +++ b/trunk/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)); diff --git a/trunk/arch/sparc/mm/srmmu.c b/trunk/arch/sparc/mm/srmmu.c index ad93d2ee6be2..c38bb72e3e80 100644 --- a/trunk/arch/sparc/mm/srmmu.c +++ b/trunk/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