Module Name: src
Committed By: macallan
Date: Sat Jul 16 01:59:05 UTC 2016
Modified Files:
src/sys/arch/mips/include: cpu.h
Log Message:
move sysctl-related #defines out of #ifdef _KERNEL so userland can see them
now pixman builds again on loongson
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/mips/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/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.119 src/sys/arch/mips/include/cpu.h:1.120
--- src/sys/arch/mips/include/cpu.h:1.119 Mon Jul 11 19:05:57 2016
+++ src/sys/arch/mips/include/cpu.h Sat Jul 16 01:59:05 2016
@@ -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 @@ struct cpu_info {
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 @@ void cpu_vmspace_exec(struct lwp *, vadd
#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_ */
