diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-01-30 06:07:14 -0500 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-01-31 15:44:46 -0500 |
| commit | 473296e072ae77e96586dcb39a1dd5d10db22611 (patch) | |
| tree | b4183366adb49523d4dcaaed93996a5b4f0c2011 /arch/arm/include/asm/glue-df.h | |
| parent | bc7dea00a9a0ea385bbc4aed67dfdcf7d8879953 (diff) | |
ARM: sync comments about available data abort models with the code
While at it bring both in the same increasing order.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Message-Id: 1359544151-26744-1-git-send-email-u.kleine-koenig@pengutronix.de
Diffstat (limited to 'arch/arm/include/asm/glue-df.h')
| -rw-r--r-- | arch/arm/include/asm/glue-df.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/include/asm/glue-df.h b/arch/arm/include/asm/glue-df.h index 8cacbcda76da..b6e9f2c108b5 100644 --- a/arch/arm/include/asm/glue-df.h +++ b/arch/arm/include/asm/glue-df.h | |||
| @@ -18,12 +18,12 @@ | |||
| 18 | * ================ | 18 | * ================ |
| 19 | * | 19 | * |
| 20 | * We have the following to choose from: | 20 | * We have the following to choose from: |
| 21 | * arm6 - ARM6 style | ||
| 22 | * arm7 - ARM7 style | 21 | * arm7 - ARM7 style |
| 23 | * v4_early - ARMv4 without Thumb early abort handler | 22 | * v4_early - ARMv4 without Thumb early abort handler |
| 24 | * v4t_late - ARMv4 with Thumb late abort handler | 23 | * v4t_late - ARMv4 with Thumb late abort handler |
| 25 | * v4t_early - ARMv4 with Thumb early abort handler | 24 | * v4t_early - ARMv4 with Thumb early abort handler |
| 26 | * v5tej_early - ARMv5 with Thumb and Java early abort handler | 25 | * v5t_early - ARMv5 with Thumb early abort handler |
| 26 | * v5tj_early - ARMv5 with Thumb and Java early abort handler | ||
| 27 | * xscale - ARMv5 with Thumb with Xscale extensions | 27 | * xscale - ARMv5 with Thumb with Xscale extensions |
| 28 | * v6_early - ARMv6 generic early abort handler | 28 | * v6_early - ARMv6 generic early abort handler |
| 29 | * v7_early - ARMv7 generic early abort handler | 29 | * v7_early - ARMv7 generic early abort handler |
| @@ -39,19 +39,19 @@ | |||
| 39 | # endif | 39 | # endif |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #ifdef CONFIG_CPU_ABRT_LV4T | 42 | #ifdef CONFIG_CPU_ABRT_EV4 |
| 43 | # ifdef CPU_DABORT_HANDLER | 43 | # ifdef CPU_DABORT_HANDLER |
| 44 | # define MULTI_DABORT 1 | 44 | # define MULTI_DABORT 1 |
| 45 | # else | 45 | # else |
| 46 | # define CPU_DABORT_HANDLER v4t_late_abort | 46 | # define CPU_DABORT_HANDLER v4_early_abort |
| 47 | # endif | 47 | # endif |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | #ifdef CONFIG_CPU_ABRT_EV4 | 50 | #ifdef CONFIG_CPU_ABRT_LV4T |
| 51 | # ifdef CPU_DABORT_HANDLER | 51 | # ifdef CPU_DABORT_HANDLER |
| 52 | # define MULTI_DABORT 1 | 52 | # define MULTI_DABORT 1 |
| 53 | # else | 53 | # else |
| 54 | # define CPU_DABORT_HANDLER v4_early_abort | 54 | # define CPU_DABORT_HANDLER v4t_late_abort |
| 55 | # endif | 55 | # endif |
| 56 | #endif | 56 | #endif |
| 57 | 57 | ||
| @@ -63,19 +63,19 @@ | |||
| 63 | # endif | 63 | # endif |
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
| 66 | #ifdef CONFIG_CPU_ABRT_EV5TJ | 66 | #ifdef CONFIG_CPU_ABRT_EV5T |
| 67 | # ifdef CPU_DABORT_HANDLER | 67 | # ifdef CPU_DABORT_HANDLER |
| 68 | # define MULTI_DABORT 1 | 68 | # define MULTI_DABORT 1 |
| 69 | # else | 69 | # else |
| 70 | # define CPU_DABORT_HANDLER v5tj_early_abort | 70 | # define CPU_DABORT_HANDLER v5t_early_abort |
| 71 | # endif | 71 | # endif |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #ifdef CONFIG_CPU_ABRT_EV5T | 74 | #ifdef CONFIG_CPU_ABRT_EV5TJ |
| 75 | # ifdef CPU_DABORT_HANDLER | 75 | # ifdef CPU_DABORT_HANDLER |
| 76 | # define MULTI_DABORT 1 | 76 | # define MULTI_DABORT 1 |
| 77 | # else | 77 | # else |
| 78 | # define CPU_DABORT_HANDLER v5t_early_abort | 78 | # define CPU_DABORT_HANDLER v5tj_early_abort |
| 79 | # endif | 79 | # endif |
| 80 | #endif | 80 | #endif |
| 81 | 81 | ||