Remove useless belt and suspenders include guards in some of our headers.
[dragonfly.git] / sys / platform / vkernel / include / globaldata.h
index 336eac9..9cd8289 100644 (file)
@@ -28,7 +28,6 @@
  *     should not include this file.
  *
  * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $
- * $DragonFly: src/sys/platform/vkernel/include/globaldata.h,v 1.8 2008/04/28 07:05:07 dillon Exp $
  */
 
 #ifndef _MACHINE_GLOBALDATA_H_
 #ifndef _SYS_VKERNEL_H_
 #include <sys/vkernel.h>       /* vpte_t */
 #endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>  /* struct segment_descriptor */
-#endif
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>       /* struct i386tss */
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 /*
  * Note on interrupt control.  Pending interrupts not yet dispatched are
@@ -83,10 +76,10 @@ struct mdglobaldata {
        int             gd_spending;    /* software interrupt pending */
        int             gd_sdelayed;    /* delayed software ints */
        int             gd_currentldt;
-       int             unused003;
+       int             unused001;
        int             unused002;
-       u_int           unused001;
-       u_int           gd_other_cpus;
+       u_int           unused003;
+       u_int           unused004;
        u_int           gd_ss_eflags;
        vpte_t          *gd_CMAP1;      /* pointer to pte for CADDR1 */
        vpte_t          *gd_CMAP2;