Merge with 2.4.0-test4-pre2.

9 files changed, 9 insertions, 9 deletions

diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in
index eede4683d..95c148eee 100644
--- a/arch/sparc64/config.in
+++ b/arch/sparc64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.116 2000/07/06 01:41:29 davem Exp $
+# $Id: config.in,v 1.117 2000/07/10 20:57:35 davem Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
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)
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile
index 6c2d54e04..fa057936a 100644
--- a/arch/sparc64/lib/Makefile
+++ b/arch/sparc64/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2000/03/31 04:06:23 davem Exp $
+# $Id: Makefile,v 1.23 2000/07/10 20:57:34 davem Exp $
 # Makefile for Sparc64 library files..
 #
 
diff --git a/arch/sparc64/lib/dec_and_lock.S b/arch/sparc64/lib/dec_and_lock.S
index dca825a7f..75dfdbfcf 100644
--- a/arch/sparc64/lib/dec_and_lock.S
+++ b/arch/sparc64/lib/dec_and_lock.S
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dec_and_lock.S,v 1.1 2000/07/10 20:57:34 davem Exp $
  * dec_and_lock.S: Sparc64 version of "atomic_dec_and_lock()"
  *                 using cas and ldstub instructions.
  *
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index e954b24c8..85e62ad25 100644
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -1,4 +1,4 @@
-/* $Id: ultra.S,v 1.43 2000/05/09 17:40:14 davem Exp $
+/* $Id: ultra.S,v 1.44 2000/07/10 20:57:35 davem Exp $
  * ultra.S: Don't expand these all over the place...
  *
  * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com)
diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c
index 8200c831f..090eb96a1 100644
--- a/arch/sparc64/solaris/fs.c
+++ b/arch/sparc64/solaris/fs.c
@@ -1,4 +1,4 @@
-/* $Id: fs.c,v 1.20 2000/07/06 01:41:30 davem Exp $
+/* $Id: fs.c,v 1.21 2000/07/10 20:57:35 davem Exp $
  * fs.c: fs related syscall emulation for Solaris
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)