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/alpha/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/alpha/mm/init.c')
| -rw-r--r-- | arch/alpha/mm/init.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 97bb6df9d..e2142b63c 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -34,7 +34,6 @@ static unsigned long totalram_pages; extern void die_if_kernel(char *,struct pt_regs *,long); -extern void show_net_buffers(void); struct thread_struct original_pcb; @@ -173,9 +172,6 @@ show_mem(void) printk("%ld pages swap cached\n",cached); printk("%ld pages in page table cache\n",pgtable_cache_size); show_buffers(); -#ifdef CONFIG_NET - show_net_buffers(); -#endif } static inline unsigned long @@ -195,7 +191,7 @@ paging_init(void) { unsigned long newptbr; unsigned long original_pcb_ptr; - unsigned int zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; unsigned long dma_pfn, high_pfn; dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; |