Module Name: src
Committed By: riz
Date: Thu May 17 18:24:27 UTC 2012
Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: cpu.h
src/sys/arch/powerpc/powerpc [netbsd-6]: powerpc_machdep.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #251):
sys/arch/powerpc/powerpc/powerpc_machdep.c: revision 1.64
sys/arch/powerpc/include/cpu.h: revision 1.90
Add CPU_EXECPROT sysctl so that atf can enable exec permission tests for
PPC Booke.
To generate a diff of this commit:
cvs rdiff -u -r1.89.2.1 -r1.89.2.2 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.89.2.1 src/sys/arch/powerpc/include/cpu.h:1.89.2.2
--- src/sys/arch/powerpc/include/cpu.h:1.89.2.1 Wed May 9 22:47:03 2012
+++ src/sys/arch/powerpc/include/cpu.h Thu May 17 18:24:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.89.2.1 2012/05/09 22:47:03 riz Exp $ */
+/* $NetBSD: cpu.h,v 1.89.2.2 2012/05/17 18:24:27 riz Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -448,6 +448,7 @@ void __syncicache(void *, size_t);
#define CPU_POWERSAVE 8 /* int: use CPU powersave mode */
#define CPU_BOOTED_DEVICE 9 /* string: device we booted from */
#define CPU_BOOTED_KERNEL 10 /* string: kernel we booted */
-#define CPU_MAXID 11 /* number of valid machdep ids */
+#define CPU_EXECPROT 11 /* bool: PROT_EXEC works */
+#define CPU_MAXID 12 /* number of valid machdep ids */
#endif /* _POWERPC_CPU_H_ */
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62.2.1
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62 Sat Feb 11 23:16:16 2012
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Thu May 17 18:24:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.62 2012/02/11 23:16:16 martin Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.62.2.1 2012/05/17 18:24:27 riz Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.62 2012/02/11 23:16:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.62.2.1 2012/05/17 18:24:27 riz Exp $");
#include "opt_altivec.h"
#include "opt_modular.h"
@@ -250,6 +250,13 @@ SYSCTL_SETUP(sysctl_machdep_setup, "sysc
NULL, cpu_altivec, NULL, 0,
CTL_MACHDEP, CPU_ALTIVEC, CTL_EOL);
#endif
+#ifdef PPC_BOOKE
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_INT, "execprot", NULL,
+ NULL, 1, NULL, 0,
+ CTL_MACHDEP, CPU_EXECPROT, CTL_EOL);
+#endif
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, "model", NULL,
