Merge with 2.4.0-test5 final.

7 files changed, 15 insertions, 36 deletions

diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index 9b90ca4af..e97248906 100644
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.44 2000/07/15 00:04:27 davem Exp $
+# $Id: Makefile,v 1.45 2000/07/18 15:24:28 jj Exp $
 # sparc64/Makefile
 #
 # Makefile for the architecture dependent flags and dependencies on the
@@ -12,7 +12,7 @@
 # line...
 SHELL  =/bin/bash
 
-CC		:= sparc64-linux-gcc
+CC		:= $(shell if gcc -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo gcc; else echo sparc64-linux-gcc; fi )
 
 NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; )
 NEW_GAS := $(shell if $(LD) --version 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 55e8516c6..e013e47fb 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -460,6 +460,7 @@ CONFIG_NLS=y
 #
 # Native Language Support
 #
+CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
@@ -476,6 +477,10 @@ CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_866 is not set
 # CONFIG_NLS_CODEPAGE_869 is not set
 # CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -488,6 +493,7 @@ CONFIG_NLS=y
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Watchdog
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c
index 795960fea..98e209de2 100644
--- a/arch/sparc64/kernel/ioctl32.c
+++ b/arch/sparc64/kernel/ioctl32.c
@@ -1,4 +1,4 @@
-/* $Id: ioctl32.c,v 1.92 2000/05/26 22:44:11 davem Exp $
+/* $Id: ioctl32.c,v 1.93 2000/07/24 22:43:15 anton Exp $
  * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
  *
  * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 0f3e5c069..486254fb9 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -1,4 +1,4 @@
-/*  $Id: setup.c,v 1.54 2000/05/09 17:40:14 davem Exp $
+/*  $Id: setup.c,v 1.55 2000/07/24 14:13:13 anton Exp $
  *  linux/arch/sparc64/kernel/setup.c
  *
  *  Copyright (C) 1995,1996  David S. Miller (davem@caip.rutgers.edu)
@@ -444,8 +444,6 @@ extern unsigned long phys_base;
 
 static struct pt_regs fake_swapper_regs = { { 0, }, 0, 0, 0, 0 };
 
-extern struct consw sun_serial_con;
-
 void register_prom_callbacks(void)
 {
 	prom_setcallback(prom_callback);
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index acd65f3f2..f99b9660c 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -673,10 +673,6 @@ static unsigned long current_tick_offset;
 #define prof_multiplier(__cpu)		cpu_data[(__cpu)].multiplier
 #define prof_counter(__cpu)		cpu_data[(__cpu)].counter
 
-extern void update_one_process(struct task_struct *p, unsigned long ticks,
-			       unsigned long user, unsigned long system,
-			       int cpu);
-
 void smp_percpu_timer_interrupt(struct pt_regs *regs)
 {
 	unsigned long compare, tick, pstate;
@@ -707,30 +703,8 @@ void smp_percpu_timer_interrupt(struct pt_regs *regs)
 				irq_exit(cpu, 0);
 			}
 
-			if (current->pid) {
-				unsigned int *inc, *inc2;
-
-				update_one_process(current, 1, user, !user, cpu);
-				if (--current->counter <= 0) {
-					current->counter = 0;
-					current->need_resched = 1;
-				}
-
-				if (user) {
-					if (current->nice > 0) {
-						inc = &kstat.cpu_nice;
-						inc2 = &kstat.per_cpu_nice[cpu];
-					} else {
-						inc = &kstat.cpu_user;
-						inc2 = &kstat.per_cpu_user[cpu];
-					}
-				} else {
-					inc = &kstat.cpu_system;
-					inc2 = &kstat.per_cpu_system[cpu];
-				}
-				atomic_inc((atomic_t *)inc);
-				atomic_inc((atomic_t *)inc2);
-			}
+			update_process_times(user);
+
 			prof_counter(cpu) = prof_multiplier(cpu);
 		}
 
diff --git a/arch/sparc64/math-emu/Makefile b/arch/sparc64/math-emu/Makefile
index 382366da5..215583800 100644
--- a/arch/sparc64/math-emu/Makefile
+++ b/arch/sparc64/math-emu/Makefile
@@ -9,6 +9,7 @@
 
 O_TARGET := math-emu.o
 O_OBJS   := math.o
-CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
+
+EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index 62c595e6d..c40225584 100644
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -1,4 +1,4 @@
-/* $Id: socksys.c,v 1.15 2000/07/13 08:06:38 davem Exp $
+/* $Id: socksys.c,v 1.16 2000/07/27 00:03:48 davem Exp $
  * socksys.c: /dev/inet/ stuff for Solaris emulation.
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)