From f4ae78d536e6dfaeb24c01b331fc38d950ed062b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 12 Jul 2000 01:43:08 +0000
Subject: Merge with 2.4.0-test4-pre2.

---
 arch/sparc64/kernel/process.c     | 2 +-
 arch/sparc64/kernel/sys_sparc.c   | 2 +-
 arch/sparc64/kernel/sys_sparc32.c | 2 +-
 arch/sparc64/kernel/sys_sunos32.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'arch/sparc64/kernel')

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 732c6975b..a09288215 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -80,7 +80,7 @@ int cpu_idle(void)
 #define unidle_me()		(cpu_data[current->processor].idle_volume = 0)
 int cpu_idle(void)
 {
-	current->priority = 0;
+	current->nice = 20;
 	current->counter = -100;
 	init_idle();
 
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index ec3042398..859d0c7ea 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sparc.c,v 1.43 2000/07/06 01:41:29 davem Exp $
+/* $Id: sys_sparc.c,v 1.44 2000/07/10 20:57:35 davem Exp $
  * linux/arch/sparc64/kernel/sys_sparc.c
  *
  * This file contains various random system calls that
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 5d2dd2985..7cadb3da5 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sparc32.c,v 1.154 2000/07/06 01:41:29 davem Exp $
+/* $Id: sys_sparc32.c,v 1.155 2000/07/10 20:57:35 davem Exp $
  * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls.
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 624a6b971..3f43e99dc 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sunos32.c,v 1.51 2000/07/06 01:41:29 davem Exp $
+/* $Id: sys_sunos32.c,v 1.52 2000/07/10 20:57:35 davem Exp $
  * sys_sunos32.c: SunOS binary compatability layer on sparc64.
  *
  * Copyright (C) 1995, 1996, 1997 David S. Miller (davem@caip.rutgers.edu)
-- 
cgit v1.2.3