diff options
| -rw-r--r-- | arch/mips/kernel/scall_o32.S | 10 | ||||
| -rw-r--r-- | arch/mips/mm/init.c | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/arch/mips/kernel/scall_o32.S b/arch/mips/kernel/scall_o32.S index 94931af0d..cb81afa07 100644 --- a/arch/mips/kernel/scall_o32.S +++ b/arch/mips/kernel/scall_o32.S @@ -1,4 +1,4 @@ -/* $Id: scall_o32.S,v 1.9 2000/01/29 01:41:59 ralf Exp $ +/* $Id: scall_o32.S,v 1.10 2000/02/23 00:41:00 ralf 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 @@ -66,10 +66,10 @@ stack_done: 1: sw v0, PT_R2(sp) # result EXPORT(o32_ret_from_sys_call) - lw t0,bh_mask - lw t1,bh_active # unused delay slot - and t0,t1 - bnez t0,o32_handle_bottom_half + lw t0, softirq_state + lw t1, softirq_state+4 # unused delay slot + and t0, t1 + bnez t0, o32_handle_softirq 9: lw t0,PT_STATUS(sp) # returning to kernel mode? andi t1, t0, KU_USER diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 36c26ce3d..bc7a36da1 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.25 2000/02/04 07:40:23 ralf Exp $ +/* $Id: init.c,v 1.26 2000/02/23 00:41:00 ralf 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 @@ -41,7 +41,6 @@ static unsigned long totalram_pages = 0; -extern void show_net_buffers(void); extern void prom_fixup_mem_map(unsigned long start, unsigned long end); extern void prom_free_prom_memory(void); @@ -238,9 +237,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 } /* References to section boundaries */ |