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

Synchronize with sys/i386/i386/machdep.c revision 1.220.

Browse Source 
Definite 2.2 candidate.
This commit is contained in:
kato 1996-12-15 09:18:48 +00:00
parent d6d60a9254
commit 75ed394f4b
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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.18 1996/12/11 16:51:15 kato Exp $
* $Id: machdep.c,v 1.19 1996/12/12 13:10:50 kato Exp $
*/
#include "npx.h"
@ -370,18 +370,16 @@ cpu_startup(dummy)
for (i = 1; i < ncallout; i++)
callout[i-1].c_next = &callout[i];
#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
boothowto |= RB_CONFIG;
#endif
#if defined(USERCONFIG)
#if defined(USERCONFIG_BOOT)
if (1) {
#else
if (boothowto & RB_CONFIG) {
#ifdef USERCONFIG
#endif
userconfig();
cninit(); /* the preferred console may have changed */
#else
printf("Sorry! no userconfig in this kernel\n");
#endif
}
#endif
#ifdef BOUNCE_BUFFERS
/*

16
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.18 1996/12/11 16:51:15 kato Exp $
* $Id: machdep.c,v 1.19 1996/12/12 13:10:50 kato Exp $
*/
#include "npx.h"
@ -370,18 +370,16 @@ cpu_startup(dummy)
for (i = 1; i < ncallout; i++)
callout[i-1].c_next = &callout[i];
#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
boothowto |= RB_CONFIG;
#endif
#if defined(USERCONFIG)
#if defined(USERCONFIG_BOOT)
if (1) {
#else
if (boothowto & RB_CONFIG) {
#ifdef USERCONFIG
#endif
userconfig();
cninit(); /* the preferred console may have changed */
#else
printf("Sorry! no userconfig in this kernel\n");
#endif
}
#endif
#ifdef BOUNCE_BUFFERS
/*