[src/trunk]: src/sys/arch/mips/include move sysctl-related #defines out of #i...

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

details:   https://anonhg.NetBSD.org/src/rev/af9b29816cb5
branches:  trunk
changeset: 346509:af9b29816cb5
user:      macallan <macallan%NetBSD.org@localhost>
date:      Sat Jul 16 01:59:05 2016 +0000

description:
move sysctl-related #defines out of #ifdef _KERNEL so userland can see them
now pixman builds again on loongson

diffstat:

 sys/arch/mips/include/cpu.h |  37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diffs (56 lines):

diff -r 3feb2e766335 -r af9b29816cb5 sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h       Sat Jul 16 01:49:42 2016 +0000
+++ b/sys/arch/mips/include/cpu.h       Sat Jul 16 01:59:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.119 2016/07/11 19:05:57 skrll Exp $  */
+/*     $NetBSD: cpu.h,v 1.120 2016/07/16 01:59:05 macallan Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -164,23 +164,6 @@
     ci = &cpu_info_store; ci != NULL; ci = NULL
 #endif
 
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CONSDEV            1       /* dev_t: console terminal device */
-#define CPU_BOOTED_KERNEL      2       /* string: booted kernel name */
-#define CPU_ROOT_DEVICE                3       /* string: root device name */
-#define CPU_LLSC               4       /* OS/CPU supports LL/SC instruction */
-#define CPU_LMMI               5       /* Loongson multimedia instructions */
-
-/*
- * Platform can override, but note this breaks userland compatibility
- * with other mips platforms.
- */
-#ifndef CPU_MAXID
-#define CPU_MAXID              5       /* number of valid machdep ids */
-#endif
-
 /* Note: must be kept in sync with -ffixed-?? Makefile.mips. */
 //     MIPS_CURLWP moved to <mips/regdef.h>
 #define MIPS_CURLWP_QUOTED     "$24"
@@ -290,4 +273,22 @@
 #endif
 
 #endif /* _KERNEL */
+
+/*
+ * CTL_MACHDEP definitions.
+ */
+#define CPU_CONSDEV            1       /* dev_t: console terminal device */
+#define CPU_BOOTED_KERNEL      2       /* string: booted kernel name */
+#define CPU_ROOT_DEVICE                3       /* string: root device name */
+#define CPU_LLSC               4       /* OS/CPU supports LL/SC instruction */
+#define CPU_LMMI               5       /* Loongson multimedia instructions */
+
+/*
+ * Platform can override, but note this breaks userland compatibility
+ * with other mips platforms.
+ */
+#ifndef CPU_MAXID
+#define CPU_MAXID              5       /* number of valid machdep ids */
+#endif
+
 #endif /* _CPU_H_ */