svn commit: r295092 - in head/sys/arm: arm include

[Michal Meloun]

Author: mmel
Date: Sun Jan 31 13:59:16 2016
New Revision: 295092
URL: https://svnweb.freebsd.org/changeset/base/295092

Log:
  ARM: First round of cpufunc.* cleaning. All abort_fixup functions are
  not currently used or defined. Delete them.

Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/include/cpufunc.h

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Sun Jan 31 09:16:20 2016	(r295091)
+++ head/sys/arm/arm/cpufunc.c	Sun Jan 31 13:59:16 2016	(r295092)
@@ -155,9 +155,6 @@ struct cpu_functions arm9_cpufuncs = {
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	arm9_context_switch,		/* context_switch	*/
 
 	arm9_setup			/* cpu setup		*/
@@ -220,9 +217,6 @@ struct cpu_functions armv5_ec_cpufuncs =
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	arm10_context_switch,		/* context_switch	*/
 
 	arm10_setup			/* cpu setup		*/
@@ -283,9 +277,6 @@ struct cpu_functions sheeva_cpufuncs = {
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	arm10_context_switch,		/* context_switch	*/
 
 	arm10_setup			/* cpu setup		*/
@@ -345,10 +336,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
 	(void *)cpufunc_nullop,		/* sleep		*/
 
 	/* Soft functions */
-
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	armv7_context_switch,		/* context_switch	*/
 
 	pj4bv7_setup			/* cpu setup		*/
@@ -412,9 +399,6 @@ struct cpu_functions xscale_cpufuncs = {
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	xscale_context_switch,		/* context_switch	*/
 
 	xscale_setup			/* cpu setup		*/
@@ -477,9 +461,6 @@ struct cpu_functions xscalec3_cpufuncs =
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
 	xscalec3_context_switch,	/* context_switch	*/
 
 	xscale_setup			/* cpu setup		*/
@@ -541,8 +522,6 @@ struct cpu_functions fa526_cpufuncs = {
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
 
 	fa526_context_switch,		/* context_switch	*/
 
@@ -605,9 +584,6 @@ struct cpu_functions arm1176_cpufuncs = 
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,             /* dataabt_fixup        */
-	cpufunc_null_fixup,             /* prefetchabt_fixup    */
-
 	arm11_context_switch,           /* context_switch       */
 
 	arm11x6_setup                   /* cpu setup            */
@@ -677,9 +653,6 @@ struct cpu_functions cortexa_cpufuncs = 
 
 	/* Soft functions */
 
-	cpufunc_null_fixup,             /* dataabt_fixup        */
-	cpufunc_null_fixup,             /* prefetchabt_fixup    */
-
 	armv7_context_switch,           /* context_switch       */
 
 	cortexa_setup                     /* cpu setup            */
@@ -995,27 +968,6 @@ out:
 }
 
 /*
- * Fixup routines for data and prefetch aborts.
- *
- * Several compile time symbols are used
- *
- * DEBUG_FAULT_CORRECTION - Print debugging information during the
- * correction of registers after a fault.
- */
-
-
-/*
- * Null abort fixup routine.
- * For use when no fixup is required.
- */
-int
-cpufunc_null_fixup(arg)
-	void *arg;
-{
-	return(ABORT_FIXUP_OK);
-}
-
-/*
  * CPU Setup code
  */
 

Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h	Sun Jan 31 09:16:20 2016	(r295091)
+++ head/sys/arm/include/cpufunc.h	Sun Jan 31 13:59:16 2016	(r295092)
@@ -164,9 +164,6 @@ struct cpu_functions {
 
 	/* Soft functions */
 
-	int	(*cf_dataabt_fixup)	(void *arg);
-	int	(*cf_prefetchabt_fixup)	(void *arg);
-
 	void	(*cf_context_switch)	(void);
 
 	void	(*cf_setup)		(void);
@@ -215,12 +212,6 @@ extern u_int cputype;
 
 #define cpu_sleep(m)		cpufuncs.cf_sleep(m)
 
-#define cpu_dataabt_fixup(a)		cpufuncs.cf_dataabt_fixup(a)
-#define cpu_prefetchabt_fixup(a)	cpufuncs.cf_prefetchabt_fixup(a)
-#define ABORT_FIXUP_OK		0	/* fixup succeeded */
-#define ABORT_FIXUP_FAILED	1	/* fixup failed */
-#define ABORT_FIXUP_RETURN	2	/* abort handler should return */
-
 #define cpu_setup()			cpufuncs.cf_setup()
 
 int	set_cpufuncs		(void);
@@ -228,9 +219,6 @@ int	set_cpufuncs		(void);
 #define ARCHITECTURE_NOT_SUPPORTED	2	/* not known */
 
 void	cpufunc_nullop		(void);
-int	cpufunc_null_fixup	(void *);
-int	early_abort_fixup	(void *);
-int	late_abort_fixup	(void *);
 u_int	cpufunc_id		(void);
 u_int	cpufunc_cpuid		(void);
 u_int	cpufunc_control		(u_int clear, u_int bic);