diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 13:00:35 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 13:00:35 -0400 |
| commit | 6cc7cbef948ea2660cc40d7aab090a479f7db6a2 (patch) | |
| tree | 7f755b98add50c5bca9b6c4410baa4d7bd555b79 /include/asm-arm | |
| parent | 6b237a355afd342509f1471e0c338637bcd958bc (diff) | |
[ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
Three of the generic cache method options were using explicit CPU
types, whereas they could use the CPU_CACHE_* definitions instead.
Switch them over to use the CPU_CACHE_* definitions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/cacheflush.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h index b611a8ea0bb2..f0845646aacb 100644 --- a/include/asm-arm/cacheflush.h +++ b/include/asm-arm/cacheflush.h | |||
| @@ -25,8 +25,7 @@ | |||
| 25 | #undef _CACHE | 25 | #undef _CACHE |
| 26 | #undef MULTI_CACHE | 26 | #undef MULTI_CACHE |
| 27 | 27 | ||
| 28 | #if defined(CONFIG_CPU_ARM610) || defined(CONFIG_CPU_ARM710) || \ | 28 | #if defined(CONFIG_CPU_CACHE_V3) |
| 29 | defined(CONFIG_CPU_ARM740T) | ||
| 30 | # ifdef _CACHE | 29 | # ifdef _CACHE |
| 31 | # define MULTI_CACHE 1 | 30 | # define MULTI_CACHE 1 |
| 32 | # else | 31 | # else |
| @@ -34,8 +33,7 @@ | |||
| 34 | # endif | 33 | # endif |
| 35 | #endif | 34 | #endif |
| 36 | 35 | ||
| 37 | #if defined(CONFIG_CPU_ARM720T) || defined(CONFIG_CPU_ARM7TDMI) || \ | 36 | #if defined(CONFIG_CPU_CACHE_V4) |
| 38 | defined(CONFIG_CPU_ARM9TDMI) | ||
| 39 | # ifdef _CACHE | 37 | # ifdef _CACHE |
| 40 | # define MULTI_CACHE 1 | 38 | # define MULTI_CACHE 1 |
| 41 | # else | 39 | # else |
| @@ -72,7 +70,7 @@ | |||
| 72 | # endif | 70 | # endif |
| 73 | #endif | 71 | #endif |
| 74 | 72 | ||
| 75 | #if defined(CONFIG_CPU_SA110) || defined(CONFIG_CPU_SA1100) | 73 | #if defined(CONFIG_CPU_CACHE_V4WB) |
| 76 | # ifdef _CACHE | 74 | # ifdef _CACHE |
| 77 | # define MULTI_CACHE 1 | 75 | # define MULTI_CACHE 1 |
| 78 | # else | 76 | # else |