diff options
| -rw-r--r-- | arch/mips/kernel/proc.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/process.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 48a5d0af8..701321a6b 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c @@ -70,7 +70,7 @@ int get_cpuinfo(char *buffer) len += sprintf(buffer + len, "unaligned accesses\t: %lu\n", unaligned_instructions); len += sprintf(buffer + len, "wait instruction\t: %s\n", - wait_available ? "yes" : "no"); + cpu_wait ? "yes" : "no"); len += sprintf(buffer + len, "microsecond timers\t: %s\n", cyclecounter_available ? "yes" : "no"); len += sprintf(buffer + len, "extra interrupt vector\t: %s\n", diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 959e7b339..2353515b9 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.17 1999/12/04 03:59:00 ralf Exp $ +/* $Id: process.c,v 1.18 2000/01/29 01:41:59 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 @@ -40,10 +40,8 @@ void cpu_idle(void) while (1) { while (!current->need_resched) - if (wait_available) - __asm__(".set\tmips3\n\t" - "wait\n\t" - ".set\tmips0"); + if (cpu_wait) + (*cpu_wait)(); schedule(); check_pgt_cache(); } |