Module Name: src
Committed By: matt
Date: Fri Mar 16 07:41:55 UTC 2012
Modified Files:
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
Log Message:
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 -r1.90 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.63 -r1.64 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 src/sys/arch/powerpc/include/cpu.h:1.90
--- src/sys/arch/powerpc/include/cpu.h:1.89 Tue Dec 13 11:03:52 2011
+++ src/sys/arch/powerpc/include/cpu.h Fri Mar 16 07:41:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.89 2011/12/13 11:03:52 kiyohara Exp $ */
+/* $NetBSD: cpu.h,v 1.90 2012/03/16 07:41:54 matt Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -444,6 +444,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.63 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.64
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.63 Sun Feb 19 21:06:24 2012
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Fri Mar 16 07:41:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.63 2012/02/19 21:06:24 rmind Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.64 2012/03/16 07:41:55 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.63 2012/02/19 21:06:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.64 2012/03/16 07:41:55 matt Exp $");
#include "opt_altivec.h"
#include "opt_modular.h"
@@ -248,6 +248,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,
