diff options
| author | kato <kato@FreeBSD.org> | 1998-11-06 08:07:32 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-11-06 08:07:32 +0000 |
| commit | 1f7a6675d01413d3621830dd2720e3c682dd0440 (patch) | |
| tree | 60f8009def593e215a152b575ea1afa6daef4991 /sys | |
| parent | 0050d4f63ef0c3b2f4ad1549bf9eafd54c9a1938 (diff) | |
| download | FreeBSD-src-1f7a6675d01413d3621830dd2720e3c682dd0440.zip FreeBSD-src-1f7a6675d01413d3621830dd2720e3c682dd0440.tar.gz | |
Sync with sys/i386/i386/machdep.c revision up to 1.315.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 25 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 25 |
2 files changed, 4 insertions, 46 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 7449379..0e0c733 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $ + * $Id: machdep.c,v 1.99 1998/10/11 15:04:38 kato Exp $ */ #include "apm.h" @@ -109,9 +109,6 @@ #include <net/netisr.h> #endif -#if NAPM > 0 -#include <machine/apm_bios.h> -#endif #include <machine/cpu.h> #include <machine/reg.h> #include <machine/clock.h> @@ -449,14 +446,7 @@ again: } #if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) { -#else - if (boothowto & RB_CONFIG) { -#endif - userconfig(); - cninit(); /* the preferred console may have changed */ - } + userconfig(); #endif printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count), @@ -807,17 +797,6 @@ cpu_halt(void) } /* - * Turn the power off. - */ -void -cpu_power_down(void) -{ -#if NAPM > 0 - apm_power_off(); -#endif -} - -/* * Clear registers on exec */ void diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 7449379..0e0c733 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $ + * $Id: machdep.c,v 1.99 1998/10/11 15:04:38 kato Exp $ */ #include "apm.h" @@ -109,9 +109,6 @@ #include <net/netisr.h> #endif -#if NAPM > 0 -#include <machine/apm_bios.h> -#endif #include <machine/cpu.h> #include <machine/reg.h> #include <machine/clock.h> @@ -449,14 +446,7 @@ again: } #if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) { -#else - if (boothowto & RB_CONFIG) { -#endif - userconfig(); - cninit(); /* the preferred console may have changed */ - } + userconfig(); #endif printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count), @@ -807,17 +797,6 @@ cpu_halt(void) } /* - * Turn the power off. - */ -void -cpu_power_down(void) -{ -#if NAPM > 0 - apm_power_off(); -#endif -} - -/* * Clear registers on exec */ void |
