diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:56:28 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:56:28 +0000 |
| commit | 5a171ddbe0a502527368f00e663df035d1d36019 (patch) | |
| tree | bf8712712f7fb0ed15d2ec33af84d7a04c3a6d7c /arch/sparc | |
| parent | f4ae78d536e6dfaeb24c01b331fc38d950ed062b (diff) | |
Merge with Linux 2.4.0-test4-pre3.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 11 | ||||
| -rw-r--r-- | arch/sparc/kernel/process.c | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index b1767a097..d5ce7038a 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -1,4 +1,4 @@ -/* $Id: pcic.c,v 1.15 2000/06/20 01:10:00 anton Exp $ +/* $Id: pcic.c,v 1.16 2000/07/11 01:38:57 davem Exp $ * pcic.c: Sparc/PCI controller support * * Copyright (C) 1998 V. Roganov and G. Raiko @@ -808,7 +808,7 @@ static __inline__ unsigned long do_gettimeoffset(void) return offset + count; } -extern volatile unsigned long lost_ticks; +extern volatile unsigned long wall_jiffies; static void pci_do_gettimeofday(struct timeval *tv) { @@ -819,10 +819,11 @@ static void pci_do_gettimeofday(struct timeval *tv) tv->tv_usec += do_gettimeoffset(); /* - * xtime is atomically updated in timer_bh. lost_ticks is - * nonzero if the timer bottom half hasnt executed yet. + * xtime is atomically updated in timer_bh. The difference + * between jiffies and wall_jiffies is nonzero if the timer + * bottom half hasnt executed yet. */ - if (lost_ticks) + if ((jiffies - wall_jiffies) != 0) tv->tv_usec += USECS_PER_JIFFY; restore_flags(flags); diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index dd5d636b9..857658391 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.148 2000/07/10 23:22:32 anton Exp $ +/* $Id: process.c,v 1.150 2000/07/11 18:49:22 anton Exp $ * linux/arch/sparc/kernel/process.c * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -126,9 +126,10 @@ int cpu_idle(void) extern char reboot_command []; +extern int serial_console; + #ifdef CONFIG_SUN_CONSOLE extern void (*prom_palette)(int); -extern int serial_console; #endif void machine_halt(void) @@ -169,7 +170,7 @@ void machine_restart(char * cmd) void machine_power_off(void) { #ifdef CONFIG_SUN_AUXIO - if (auxio_power_register) + if (auxio_power_register && !serial_console) *auxio_power_register |= AUXIO_POWER_OFF; #endif machine_halt(); |