8115 parallel zfs mount

@@ -21,19 +21,21 @@
 
 /*
  * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2014 Igor Kozhukhov <ikozhukhov@gmail.com>.
+ * Copyright 2017 RackTop Systems.
  */
 
 #ifndef _SYS_CPUVAR_H
 #define _SYS_CPUVAR_H
 
 #include <sys/thread.h>
 #include <sys/sysinfo.h>        /* has cpu_stat_t definition */
 #include <sys/disp.h>
 #include <sys/processor.h>
+#include <sys/kcpc.h>           /* has kcpc_ctx_t definition */
 
 #include <sys/loadavg.h>
 #if (defined(_KERNEL) || defined(_KMEMUSER)) && defined(_MACHDEP)
 #include <sys/machcpuvar.h>
 #endif

@@ -612,13 +614,13 @@
 #define CPU_NEW_GENERATION(cp)  ((cp)->cpu_generation++)
 
 #endif /* _KERNEL || _KMEMUSER */
 
 /*
- * CPU support routines.
+ * CPU support routines (not for genassym.c)
  */
-#if     defined(_KERNEL) && defined(__STDC__)   /* not for genassym.c */
+#if     defined(_KERNEL) || defined(_FAKE_KERNEL) && defined(__STDC__)
 
 struct zone;
 
 void    cpu_list_init(cpu_t *);
 void    cpu_add_unit(cpu_t *);

@@ -821,11 +823,11 @@
 extern void init_cpu_info(struct cpu *);
 extern void populate_idstr(struct cpu *);
 extern void cpu_vm_data_init(struct cpu *);
 extern void cpu_vm_data_destroy(struct cpu *);
 
-#endif  /* _KERNEL */
+#endif  /* _KERNEL || _FAKE_KERNEL */
 
 #ifdef  __cplusplus
 }
 #endif