socsvn commit: r272315 - in soc2014/op/freebsd-base/sys: kern sys x86/x86

[op at FreeBSD.org]

Author: op
Date: Wed Aug 13 00:47:11 2014
New Revision: 272315
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272315

Log:
  KSP: constify ksp_selector_table
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap+kpatch

Modified:
  soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c
  soc2014/op/freebsd-base/sys/sys/selfpatch.h
  soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c

Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c
==============================================================================
--- soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c	Tue Aug 12 23:48:37 2014	(r272314)
+++ soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c	Wed Aug 13 00:47:11 2014	(r272315)
@@ -86,7 +86,7 @@
 	}
 
 	matched = NULL;
-	for (e = ksp_selector_table;
+	for (e = __DECONST(struct ksp_selector_entry *, ksp_selector_table);
 	    (e->feature_selector != KSP_NULL) && (e->featurep != NULL);
 	    e++) {
 		if (e->feature_selector == p->feature_selector) {

Modified: soc2014/op/freebsd-base/sys/sys/selfpatch.h
==============================================================================
--- soc2014/op/freebsd-base/sys/sys/selfpatch.h	Tue Aug 12 23:48:37 2014	(r272314)
+++ soc2014/op/freebsd-base/sys/sys/selfpatch.h	Wed Aug 13 00:47:11 2014	(r272315)
@@ -40,7 +40,7 @@
 };
 #define KSP_SELECTOR_END	{KSP_NULL, NULL}
 
-extern struct ksp_selector_entry ksp_selector_table[];
+extern const struct ksp_selector_entry ksp_selector_table[];
 
 #define KSP_FEATURE_SELFTEST	1
 

Modified: soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c
==============================================================================
--- soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c	Tue Aug 12 23:48:37 2014	(r272314)
+++ soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c	Wed Aug 13 00:47:11 2014	(r272315)
@@ -39,7 +39,7 @@
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-struct ksp_selector_entry ksp_selector_table[] = {
+const struct ksp_selector_entry ksp_selector_table[] = {
 	/* feature_selector	feature pointer */
 	{KSP_CPUID,		&cpu_feature},
 	{KSP_CPUID2,		&cpu_feature2},