Hi,
Some boards have, eg.:
arch/mips/momentum/ocelot_3/prom.c:242:void __init prom_free_prom_memory(void)
yet free_initmem() expects a return:
arch/mips/mm/init.c:285:extern unsigned long prom_free_prom_memory(void);
arch/mips/mm/init.c:291: freed = prom_free_prom_memory();
Fix those up and return 0 instead, just like everyone else does.
Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
---
arch/mips/momentum/jaguar_atx/prom.c | 3 ++-
arch/mips/momentum/ocelot_3/prom.c | 3 ++-
arch/mips/pmc-sierra/yosemite/prom.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
718345abbb965ef544659d6cb0e90dee1535107b
diff --git a/arch/mips/momentum/jaguar_atx/prom.c
b/arch/mips/momentum/jaguar_atx/prom.c
--- a/arch/mips/momentum/jaguar_atx/prom.c
+++ b/arch/mips/momentum/jaguar_atx/prom.c
@@ -236,8 +236,9 @@ void __init prom_init(void)
#endif
}
-void __init prom_free_prom_memory(void)
+unsigned long __init prom_free_prom_memory(void)
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
diff --git a/arch/mips/momentum/ocelot_3/prom.c
b/arch/mips/momentum/ocelot_3/prom.c
--- a/arch/mips/momentum/ocelot_3/prom.c
+++ b/arch/mips/momentum/ocelot_3/prom.c
@@ -239,8 +239,9 @@ void __init prom_init(void)
#endif
}
-void __init prom_free_prom_memory(void)
+unsigned long __init prom_free_prom_memory(void)
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c
b/arch/mips/pmc-sierra/yosemite/prom.c
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -132,8 +132,9 @@ void __init prom_init(void)
prom_grab_secondary();
}
-void __init prom_free_prom_memory(void)
+unsigned long __init prom_free_prom_memory(void)
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
|