diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /arch/ppc/kernel/idle.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'arch/ppc/kernel/idle.c')
| -rw-r--r-- | arch/ppc/kernel/idle.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c index bd7980678..b6c338946 100644 --- a/arch/ppc/kernel/idle.c +++ b/arch/ppc/kernel/idle.c @@ -1,5 +1,5 @@ /* - * $Id: idle.c,v 1.48 1998/07/30 11:29:22 davem Exp $ + * $Id: idle.c,v 1.56 1998/10/13 19:14:36 paulus Exp $ * * Idle daemon for PowerPC. Idle daemon will handle any action * that needs to be taken when the system becomes idle. @@ -11,8 +11,6 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#define __KERNEL_SYSCALLS__ - #include <linux/config.h> #include <linux/errno.h> #include <linux/sched.h> @@ -32,9 +30,6 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/cache.h> -#ifdef CONFIG_PMAC -#include <asm/mediabay.h> -#endif void zero_paged(void); void power_save(void); @@ -53,22 +48,15 @@ int idled(void *unused) __sti(); /* endless loop with no priority at all */ - current->priority = -100; - current->counter = -100; + current->priority = 0; + current->counter = 0; check_pgt_cache(); if ( !current->need_resched && zero_paged_on ) zero_paged(); if ( !current->need_resched && htab_reclaim_on ) htab_reclaim(); - - /* - * Only processor 1 may sleep now since processor 2 would - * never wake up. Need to add timer code for processor 2 - * then it can sleep. -- Cort - */ -#ifndef __SMP__ if ( !current->need_resched ) power_save(); -#endif /* __SMP__ */ + run_task_queue(&tq_scheduler); schedule(); } ret = 0; @@ -92,15 +80,9 @@ int cpu_idle(void *unused) */ asmlinkage int sys_idle(void) { - extern int media_bay_task(void *); if(current->pid != 0) return -EPERM; -#ifdef CONFIG_PMAC - if (media_bay_present) - kernel_thread(media_bay_task, NULL, 0); -#endif - idled(NULL); return 0; /* should never execute this but it makes gcc happy -- Cort */ } |