summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/kernel/smp.c25
-rw-r--r--arch/ia64/kernel/smp.c26
-rw-r--r--arch/mips/defconfig-cobalt2
-rw-r--r--arch/mips/defconfig-orion2
-rw-r--r--arch/mips/defconfig-rm2002
-rw-r--r--arch/mips64/defconfig2
-rw-r--r--arch/mips64/defconfig-ip222
-rw-r--r--arch/mips64/defconfig-ip272
-rw-r--r--arch/sparc/defconfig6
-rw-r--r--arch/sparc/kernel/irq.c2
-rw-r--r--arch/sparc/kernel/sun4d_irq.c2
-rw-r--r--arch/sparc/kernel/sun4d_smp.c27
-rw-r--r--arch/sparc/kernel/sun4m_smp.c27
-rw-r--r--arch/sparc/math-emu/Makefile2
-rw-r--r--arch/sparc64/Makefile4
-rw-r--r--arch/sparc64/defconfig6
-rw-r--r--arch/sparc64/kernel/ioctl32.c2
-rw-r--r--arch/sparc64/kernel/setup.c4
-rw-r--r--arch/sparc64/kernel/smp.c30
-rw-r--r--arch/sparc64/math-emu/Makefile3
-rw-r--r--arch/sparc64/solaris/socksys.c2
21 files changed, 36 insertions, 144 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index b00e7d79b..e51ff9d18 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -622,10 +622,6 @@ smp_commence(void)
}
-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)
{
@@ -643,26 +639,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs)
which would be a Bad Thing. */
irq_enter(cpu, RTC_IRQ);
- update_one_process(current, 1, user, !user, cpu);
- if (current->pid) {
- if (--current->counter <= 0) {
- current->counter = 0;
- current->need_resched = 1;
- }
-
- if (user) {
- if (current->nice > 0) {
- kstat.cpu_nice++;
- kstat.per_cpu_nice[cpu]++;
- } else {
- kstat.cpu_user++;
- kstat.per_cpu_user[cpu]++;
- }
- } else {
- kstat.cpu_system++;
- kstat.per_cpu_system[cpu]++;
- }
- }
+ update_process_times(user);
data->prof_counter = data->prof_multiplier;
irq_exit(cpu, RTC_IRQ);
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index cee60fa97..b5153433f 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -396,35 +396,11 @@ void
smp_do_timer(struct pt_regs *regs)
{
int cpu = smp_processor_id();
- int user = user_mode(regs);
struct cpuinfo_ia64 *data = &cpu_data[cpu];
- extern void update_one_process(struct task_struct *, unsigned long, unsigned long,
- unsigned long, int);
if (!--data->prof_counter) {
irq_enter(cpu, TIMER_IRQ);
-
- update_one_process(current, 1, user, !user, cpu);
- if (current->pid) {
- if (--current->counter < 0) {
- current->counter = 0;
- current->need_resched = 1;
- }
-
- if (user) {
- if (current->nice > 0) {
- kstat.cpu_nice++;
- kstat.per_cpu_nice[cpu]++;
- } else {
- kstat.cpu_user++;
- kstat.per_cpu_user[cpu]++;
- }
- } else {
- kstat.cpu_system++;
- kstat.per_cpu_system[cpu]++;
- }
- }
-
+ update_process_times(user_mode(regs));
data->prof_counter = data->prof_multiplier;
irq_exit(cpu, TIMER_IRQ);
}
diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt
index bfef9e3a0..01661a95d 100644
--- a/arch/mips/defconfig-cobalt
+++ b/arch/mips/defconfig-cobalt
@@ -447,8 +447,8 @@ CONFIG_RTC=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion
index e45b978b4..4073bfd32 100644
--- a/arch/mips/defconfig-orion
+++ b/arch/mips/defconfig-orion
@@ -202,8 +202,8 @@ CONFIG_BLK_DEV_INITRD=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index f67154e91..de2f2e8c2 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -233,8 +233,8 @@ CONFIG_RTC=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index aa9fdef16..12937f110 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -326,8 +326,8 @@ CONFIG_SERIAL_CONSOLE=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index 6c2835d21..497b54e17 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -245,8 +245,8 @@ CONFIG_VT_CONSOLE=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index aa9fdef16..12937f110 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -326,8 +326,8 @@ CONFIG_SERIAL_CONSOLE=y
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
# CONFIG_AGP is not set
+# CONFIG_DRM is not set
#
# File systems
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index b4b50975d..c58948e71 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -323,6 +323,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
@@ -339,6 +340,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
@@ -351,6 +356,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/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 0e05908fe..65e95afdb 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -1,4 +1,4 @@
-/* $Id: irq.c,v 1.104 2000/06/30 10:18:38 davem Exp $
+/* $Id: irq.c,v 1.105 2000/07/26 01:04:02 davem Exp $
* arch/sparc/kernel/irq.c: Interrupt request handling routines. On the
* Sparc the IRQ's are basically 'cast in stone'
* and you are supposed to probe the prom's device
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 59f014efc..4ce99b06b 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -1,4 +1,4 @@
-/* $Id: sun4d_irq.c,v 1.25 2000/05/09 17:40:13 davem Exp $
+/* $Id: sun4d_irq.c,v 1.26 2000/07/26 01:04:03 davem Exp $
* arch/sparc/kernel/sun4d_irq.c:
* SS1000/SC2000 interrupt handling.
*
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index fe9885025..1294ad31a 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -441,10 +441,6 @@ void smp4d_message_pass(int target, int msg, unsigned long data, int wait)
extern unsigned int prof_multiplier[NR_CPUS];
extern unsigned int prof_counter[NR_CPUS];
-extern void update_one_process(struct task_struct *p, unsigned long ticks,
- unsigned long user, unsigned long system,
- int cpu);
-
extern void sparc_do_profile(unsigned long pc, unsigned long o7);
void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
@@ -471,29 +467,10 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
int user = user_mode(regs);
irq_enter(cpu, 0);
- if(current->pid) {
- update_one_process(current, 1, user, !user, cpu);
-
- if(--current->counter <= 0) {
- current->counter = 0;
- current->need_resched = 1;
- }
+ update_process_times(user);
+ irq_exit(cpu, 0);
- if(user) {
- if(current->nice > 0) {
- kstat.cpu_nice++;
- kstat.per_cpu_nice[cpu]++;
- } else {
- kstat.cpu_user++;
- kstat.per_cpu_user[cpu]++;
- }
- } else {
- kstat.cpu_system++;
- kstat.per_cpu_system[cpu]++;
- }
- }
prof_counter[cpu] = prof_multiplier[cpu];
- irq_exit(cpu, 0);
}
}
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 3475a8df5..60c37373e 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -439,10 +439,6 @@ void smp4m_cross_call_irq(void)
extern unsigned int prof_multiplier[NR_CPUS];
extern unsigned int prof_counter[NR_CPUS];
-extern void update_one_process(struct task_struct *p, unsigned long ticks,
- unsigned long user, unsigned long system,
- int cpu);
-
extern void sparc_do_profile(unsigned long pc, unsigned long o7);
void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
@@ -458,29 +454,10 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
int user = user_mode(regs);
irq_enter(cpu, 0);
- if(current->pid) {
- update_one_process(current, 1, user, !user, cpu);
-
- if(--current->counter <= 0) {
- current->counter = 0;
- current->need_resched = 1;
- }
+ update_process_times(user);
+ irq_exit(cpu, 0);
- if(user) {
- if(current->nice > 0) {
- kstat.cpu_nice++;
- kstat.per_cpu_nice[cpu]++;
- } else {
- kstat.cpu_user++;
- kstat.per_cpu_user[cpu]++;
- }
- } else {
- kstat.cpu_system++;
- kstat.per_cpu_system[cpu]++;
- }
- }
prof_counter[cpu] = prof_multiplier[cpu];
- irq_exit(cpu, 0);
}
}
diff --git a/arch/sparc/math-emu/Makefile b/arch/sparc/math-emu/Makefile
index 3c4195085..586eba5bb 100644
--- a/arch/sparc/math-emu/Makefile
+++ b/arch/sparc/math-emu/Makefile
@@ -16,6 +16,6 @@ O_OBJS := math.o ashldi3.o
.S.o:
$(CC) $(AFLAGS) -ansi -c $< -o $*.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/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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:11:47 +0000