kernel/x86_64: Remove some bogus #ifndefs.

diff --git a/sys/cpu/x86_64/include/types.h b/sys/cpu/x86_64/include/types.h
index 7b4c899..742bccc 100644 (file)
--- a/sys/cpu/x86_64/include/types.h
+++ b/sys/cpu/x86_64/include/types.h
@@ -66,13 +66,10 @@ typedef     __uint64_t      uintfptr_t;
 /*
  * MMU page tables
  */
-#ifndef JG_defined_pml4_entry_t
-#define JG_defined_pml4_entry_t
 typedef __uint64_t     pml4_entry_t;
 typedef __uint64_t     pdp_entry_t;
 typedef __uint64_t     pd_entry_t;
 typedef __uint64_t     pt_entry_t;
-#endif
 typedef __uint64_t      cpumask_t;      /* mask representing a set of cpus */
 
 #if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
@@ -87,4 +84,3 @@ typedef __uint64_t      cpumask_t;      /* mask representing a set of cpus */
 #define PTESIZE         sizeof(pt_entry_t) /* for assembly files */
 
 #endif /* !_CPU_TYPES_H_ */
-

diff --git a/sys/platform/pc64/include/intr_machdep.h b/sys/platform/pc64/include/intr_machdep.h
index 2ef62d8..98a979e 100644 (file)
--- a/sys/platform/pc64/include/intr_machdep.h
+++ b/sys/platform/pc64/include/intr_machdep.h
@@ -136,10 +136,7 @@
 /*
  * Type of the first (asm) part of an interrupt handler.
  */
-#ifndef JG_defined_inthand_t
-#define JG_defined_inthand_t
 typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
-#endif
 
 #define        IDTVEC(name)    __CONCAT(X,name)