diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/mips64/mm/init.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/mips64/mm/init.c')
| -rw-r--r-- | arch/mips64/mm/init.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c index 000ba906f..2ff7865ad 100644 --- a/arch/mips64/mm/init.c +++ b/arch/mips64/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.11 2000/02/04 07:40:24 ralf Exp $ +/* $Id: init.c,v 1.12 2000/02/10 02:03:59 kanoj Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -40,8 +40,6 @@ unsigned long totalram_pages = 0; -extern void show_net_buffers(void); - void __bad_pte_kernel(pmd_t *pmd) { printk("Bad pmd in pte_alloc_kernel: %08lx\n", pmd_val(*pmd)); @@ -332,9 +330,6 @@ void show_mem(void) printk("%ld pages in page table cache\n", pgtable_cache_size); printk("%d free pages\n", free); show_buffers(); -#ifdef CONFIG_NET - show_net_buffers(); -#endif } #ifndef CONFIG_DISCONTIGMEM @@ -345,7 +340,7 @@ extern char __init_begin, __init_end; void __init paging_init(void) { - unsigned int zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; unsigned long max_dma, low; /* Initialize the entire pgd. */ |