Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / mips / sgi-ip27 / ip27-memory.c

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 64d8dab06b01697425e4a6073bf1e1d6ae0bca44..1230f56429d7334ea418f41921e709a9b737586a 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -457,7 +457,7 @@ void __init prom_free_prom_memory(void)
        /* We got nothing to free here ...  */
 }
 
-extern unsigned long setup_zero_pages(void);
+extern void setup_zero_pages(void);
 
 void __init paging_init(void)
 {
@@ -492,7 +492,7 @@ void __init mem_init(void)
                totalram_pages += free_all_bootmem_node(NODE_DATA(node));
        }
 
-       totalram_pages -= setup_zero_pages();   /* This comes from node 0 */
+       setup_zero_pages();     /* This comes from node 0 */
 
        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;