Compensate for pcb.h tweaks.
(Bruce pointed out the nesting)
This commit is contained in:
Peter Wemm
parent
b54470b433
commit
b67dffdad2
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $
|
||||
* $Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
|
||||
*/
|
||||
|
||||
#include "apm.h"
|
||||
@ -106,6 +106,7 @@
|
||||
#include <machine/cons.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */
|
||||
#ifdef SMP
|
||||
#include <machine/smp.h>
|
||||
#endif
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $
|
||||
* $Id: sys_machdep.c,v 1.26 1997/10/10 09:44:08 peter Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/pcb_ext.h> /* pcb.h included by sys/user.h */
|
||||
#include <machine/sysarch.h>
|
||||
|
||||
#include <vm/vm_kern.h> /* for kernel_map */
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
|
||||
* $Id: trap.c,v 1.112 1997/10/10 09:44:09 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -75,12 +75,17 @@
|
||||
#include <machine/psl.h>
|
||||
#include <machine/../isa/intr_machdep.h>
|
||||
#include <machine/smp.h>
|
||||
#include <machine/tss.h>
|
||||
|
||||
#ifdef POWERFAIL_NMI
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/clock.h>
|
||||
#endif
|
||||
|
||||
#ifdef VM86
|
||||
#include <machine/vm86.h>
|
||||
#endif
|
||||
|
||||
#include "isa.h"
|
||||
#include "npx.h"
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $
|
||||
* $Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
|
||||
*/
|
||||
|
||||
#include "apm.h"
|
||||
@ -106,6 +106,7 @@
|
||||
#include <machine/cons.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */
|
||||
#ifdef SMP
|
||||
#include <machine/smp.h>
|
||||
#endif
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $
|
||||
* $Id: sys_machdep.c,v 1.26 1997/10/10 09:44:08 peter Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/pcb_ext.h> /* pcb.h included by sys/user.h */
|
||||
#include <machine/sysarch.h>
|
||||
|
||||
#include <vm/vm_kern.h> /* for kernel_map */
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
|
||||
* $Id: trap.c,v 1.112 1997/10/10 09:44:09 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -75,12 +75,17 @@
|
||||
#include <machine/psl.h>
|
||||
#include <machine/../isa/intr_machdep.h>
|
||||
#include <machine/smp.h>
|
||||
#include <machine/tss.h>
|
||||
|
||||
#ifdef POWERFAIL_NMI
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/clock.h>
|
||||
#endif
|
||||
|
||||
#ifdef VM86
|
||||
#include <machine/vm86.h>
|
||||
#endif
|
||||
|
||||
#include "isa.h"
|
||||
#include "npx.h"
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: vm86.c,v 1.2 1997/08/28 14:36:55 jlemon Exp $
|
||||
* $Id: vm86.c,v 1.3 1997/09/01 01:12:53 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -39,8 +39,9 @@
|
||||
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <machine/psl.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */
|
||||
#include <machine/psl.h>
|
||||
#include <machine/specialreg.h>
|
||||
|
||||
extern int i386_extend_pcb __P((struct proc *));
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $
|
||||
* $Id: trap.c,v 1.112 1997/10/10 09:44:09 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -75,12 +75,17 @@
|
||||
#include <machine/psl.h>
|
||||
#include <machine/../isa/intr_machdep.h>
|
||||
#include <machine/smp.h>
|
||||
#include <machine/tss.h>
|
||||
|
||||
#ifdef POWERFAIL_NMI
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/clock.h>
|
||||
#endif
|
||||
|
||||
#ifdef VM86
|
||||
#include <machine/vm86.h>
|
||||
#endif
|
||||
|
||||
#include "isa.h"
|
||||
#include "npx.h"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user