d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with sys/i386/i386/machdep.c revision up to 1.315.

Browse Source
This commit is contained in:
KATO Takenori 1998-11-06 08:07:32 +00:00
parent 48ba888a6a
commit c70606fd9f
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/pc98/i386/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
}
#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),
@ -806,17 +796,6 @@ cpu_halt(void)
__asm__ ("hlt");
}
/*
* Turn the power off.
*/
void
cpu_power_down(void)
{
#if NAPM > 0
apm_power_off();
#endif
}
/*
* Clear registers on exec
*/

25
sys/pc98/pc98/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
}
#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),
@ -806,17 +796,6 @@ cpu_halt(void)
__asm__ ("hlt");
}
/*
* Turn the power off.
*/
void
cpu_power_down(void)
{
#if NAPM > 0
apm_power_off();
#endif
}
/*
* Clear registers on exec
*/