[src/trunk]: src/sys/arch/arm/include expose cpu structures to kmemuser and p...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e1a1e26ff2b
branches:  trunk
changeset: 777350:1e1a1e26ff2b
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 16 02:30:32 2012 +0000

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

diffstat:

 sys/arch/arm/include/cpu.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 86fd0353662c -r 1e1a1e26ff2b sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h        Thu Feb 16 02:29:25 2012 +0000
+++ b/sys/arch/arm/include/cpu.h        Thu Feb 16 02:30:32 2012 +0000
@@ -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>