summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-12 01:43:08 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-12 01:43:08 +0000
commitf4ae78d536e6dfaeb24c01b331fc38d950ed062b (patch)
tree6930a78aa7cc4ee1829d50d3bcbaf0dbe9e2e905 /arch/ppc
parent66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff)
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/amiga/chipram.c1
-rw-r--r--arch/ppc/kernel/idle.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/amiga/chipram.c b/arch/ppc/amiga/chipram.c
index 259522584..c7952c368 100644
--- a/arch/ppc/amiga/chipram.c
+++ b/arch/ppc/amiga/chipram.c
@@ -5,6 +5,7 @@
** - 64-bit aligned allocations for full AGA compatibility
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 1d3dfd299..a81156102 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -48,7 +48,7 @@ atomic_t zeropage_calls; /* # zero'd pages request that've been made */
int idled(void)
{
/* endless loop with no priority at all */
- current->priority = 0;
+ current->nice = 20;
current->counter = -100;
init_idle();
for (;;)