mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Sync with sys/i386/i386/machdep.c revision up to 1.315.
This commit is contained in:
parent
48ba888a6a
commit
c70606fd9f
2 changed files with 4 additions and 46 deletions
|
|
@ -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),
|
||||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue