Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 473296e0 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: sync comments about available data abort models with the code 



While at it bring both in the same increasing order.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Message-Id: 1359544151-26744-1-git-send-email-u.kleine-koenig@pengutronix.de
parent bc7dea00

arch/arm/include/asm/glue-df.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -18,12 +18,12 @@ 
 *	================

 *	================

 *

 *

 *	We have the following to choose from:

 *	We have the following to choose from:

 *	  arm6          - ARM6 style

 *	  arm7		- ARM7 style

 *	  arm7		- ARM7 style

 *	  v4_early	- ARMv4 without Thumb early abort handler

 *	  v4_early	- ARMv4 without Thumb early abort handler

 *	  v4t_late	- ARMv4 with Thumb late abort handler

 *	  v4t_late	- ARMv4 with Thumb late abort handler

 *	  v4t_early	- ARMv4 with Thumb early abort handler

 *	  v4t_early	- ARMv4 with Thumb early abort handler

 *	  v5tej_early	- ARMv5 with Thumb and Java early abort handler

 *	  v5t_early	- ARMv5 with Thumb early abort handler

 *	  v5tj_early	- ARMv5 with Thumb and Java early abort handler

 *	  xscale	- ARMv5 with Thumb with Xscale extensions

 *	  xscale	- ARMv5 with Thumb with Xscale extensions

 *	  v6_early	- ARMv6 generic early abort handler

 *	  v6_early	- ARMv6 generic early abort handler

 *	  v7_early	- ARMv7 generic early abort handler

 *	  v7_early	- ARMv7 generic early abort handler
@@ -39,19 +39,19 @@ 
# endif

# endif

#endif

#endif





#ifdef CONFIG_CPU_ABRT_LV4T

#ifdef CONFIG_CPU_ABRT_EV4

# ifdef CPU_DABORT_HANDLER

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

#  define MULTI_DABORT 1

# else

# else

#  define CPU_DABORT_HANDLER v4t_late_abort

#  define CPU_DABORT_HANDLER v4_early_abort

# endif

# endif

#endif

#endif





#ifdef CONFIG_CPU_ABRT_EV4

#ifdef CONFIG_CPU_ABRT_LV4T

# ifdef CPU_DABORT_HANDLER

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

#  define MULTI_DABORT 1

# else

# else

#  define CPU_DABORT_HANDLER v4_early_abort

#  define CPU_DABORT_HANDLER v4t_late_abort

# endif

# endif

#endif

#endif
@@ -63,19 +63,19 @@ 
# endif

# endif

#endif

#endif





#ifdef CONFIG_CPU_ABRT_EV5TJ

#ifdef CONFIG_CPU_ABRT_EV5T

# ifdef CPU_DABORT_HANDLER

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

#  define MULTI_DABORT 1

# else

# else

#  define CPU_DABORT_HANDLER v5tj_early_abort

#  define CPU_DABORT_HANDLER v5t_early_abort

# endif

# endif

#endif

#endif





#ifdef CONFIG_CPU_ABRT_EV5T

#ifdef CONFIG_CPU_ABRT_EV5TJ

# ifdef CPU_DABORT_HANDLER

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

#  define MULTI_DABORT 1

# else

# else

#  define CPU_DABORT_HANDLER v5t_early_abort

#  define CPU_DABORT_HANDLER v5tj_early_abort

# endif

# endif

#endif

#endif