X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3903760236c30e3b5ace7a4eefac3a269d68957c..d9a64523371fa019c4575bb400cbbc3a50ac9903:/osfmk/mach/machine.h

diff --git a/osfmk/mach/machine.h b/osfmk/mach/machine.h
index c057fb799..b7a5d36b6 100644
--- a/osfmk/mach/machine.h
+++ b/osfmk/mach/machine.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2007-2016 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -126,8 +127,8 @@ __END_DECLS
 /*
  * Capability bits used in the definition of cpu_type.
  */
-#define	CPU_ARCH_MASK	0xff000000		/* mask for architecture bits */
-#define CPU_ARCH_ABI64	0x01000000		/* 64 bit ABI */
+#define	CPU_ARCH_MASK		0xff000000	/* mask for architecture bits */
+#define CPU_ARCH_ABI64		0x01000000	/* 64 bit ABI */
 
 /*
  *	Machine types known by all.
@@ -150,7 +151,7 @@ __END_DECLS
 #define CPU_TYPE_MC98000	((cpu_type_t) 10)
 #define CPU_TYPE_HPPA           ((cpu_type_t) 11)
 #define CPU_TYPE_ARM		((cpu_type_t) 12)
-#define CPU_TYPE_ARM64          (CPU_TYPE_ARM | CPU_ARCH_ABI64)
+#define CPU_TYPE_ARM64		(CPU_TYPE_ARM | CPU_ARCH_ABI64)
 #define CPU_TYPE_MC88000	((cpu_type_t) 13)
 #define CPU_TYPE_SPARC		((cpu_type_t) 14)
 #define CPU_TYPE_I860		((cpu_type_t) 15)
@@ -367,6 +368,7 @@ __END_DECLS
 #define CPU_SUBTYPE_ARM64_ALL           ((cpu_subtype_t) 0)
 #define CPU_SUBTYPE_ARM64_V8            ((cpu_subtype_t) 1)
 
+
 #endif /* !__ASSEMBLER__ */
 
 /*
@@ -393,6 +395,7 @@ __END_DECLS
 #define CPUFAMILY_INTEL_HASWELL		0x10b282dc
 #define CPUFAMILY_INTEL_BROADWELL	0x582ed09c
 #define CPUFAMILY_INTEL_SKYLAKE		0x37fc219f
+#define CPUFAMILY_INTEL_KABYLAKE	0x0f817246
 #define CPUFAMILY_ARM_9			0xe73283ae
 #define CPUFAMILY_ARM_11		0x8ff620d8
 #define CPUFAMILY_ARM_XSCALE		0x53b005f5
@@ -405,6 +408,7 @@ __END_DECLS
 #define CPUFAMILY_ARM_TYPHOON		0x2c91a47e
 #define CPUFAMILY_ARM_TWISTER		0x92fb37c8
 #define CPUFAMILY_ARM_HURRICANE		0x67ceee93
+#define CPUFAMILY_ARM_MONSOON_MISTRAL	0xe81e7ef6
 
 /* The following synonyms are deprecated: */
 #define CPUFAMILY_INTEL_6_23	CPUFAMILY_INTEL_PENRYN