Module Name:    src
Committed By:   christos
Date:           Thu Feb 16 02:30:32 UTC 2012

Modified Files:
        src/sys/arch/arm/include: cpu.h

Log Message:
expose cpu structures to kmemuser and prevent opt_*.h from being included
if kmemuser


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arm/include/cpu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.62 src/sys/arch/arm/include/cpu.h:1.63
--- src/sys/arch/arm/include/cpu.h:1.62	Sat Nov 13 08:13:33 2010
+++ src/sys/arch/arm/include/cpu.h	Wed Feb 15 21:30:32 2012
@@ -60,18 +60,18 @@
 #define	CPU_POWERSAVE		5	/* int: use CPU powersave mode */
 #define	CPU_MAXID		6	/* number of valid machdep ids */
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KMEMUSER)
 
 /*
  * Kernel-only definitions
  */
 
-#ifndef _LKM
+#if !defined(_LKM) && defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 #include "opt_lockdebug.h"
 #include "opt_cputypes.h"
-#endif /* !_LKM */
+#endif /* !_LKM && _KERNEL_OPT */
 
 #include <arm/cpuconf.h>
 

Reply via email to