diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:25:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:26:00 -0400 |
| commit | 5af8c4e0fac9838428bd718040b664043a05f37c (patch) | |
| tree | 75a01d98ed244db45fe3c734c4a81c1a3d92ac37 /arch/arm/include/asm/cacheflush.h | |
| parent | 46e0bb9c12f4bab539736f1714cbf16600f681ec (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into sched/urgent
Merge reason: update to latest upstream to queue up fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include/asm/cacheflush.h')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 6cbd8fdc9f1f..bb7d695f3900 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h | |||
| @@ -46,6 +46,14 @@ | |||
| 46 | # define MULTI_CACHE 1 | 46 | # define MULTI_CACHE 1 |
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | #if defined(CONFIG_CPU_FA526) | ||
| 50 | # ifdef _CACHE | ||
| 51 | # define MULTI_CACHE 1 | ||
| 52 | # else | ||
| 53 | # define _CACHE fa | ||
| 54 | # endif | ||
| 55 | #endif | ||
| 56 | |||
| 49 | #if defined(CONFIG_CPU_ARM926T) | 57 | #if defined(CONFIG_CPU_ARM926T) |
| 50 | # ifdef _CACHE | 58 | # ifdef _CACHE |
| 51 | # define MULTI_CACHE 1 | 59 | # define MULTI_CACHE 1 |
| @@ -94,6 +102,14 @@ | |||
| 94 | # endif | 102 | # endif |
| 95 | #endif | 103 | #endif |
| 96 | 104 | ||
| 105 | #if defined(CONFIG_CPU_MOHAWK) | ||
| 106 | # ifdef _CACHE | ||
| 107 | # define MULTI_CACHE 1 | ||
| 108 | # else | ||
| 109 | # define _CACHE mohawk | ||
| 110 | # endif | ||
| 111 | #endif | ||
| 112 | |||
| 97 | #if defined(CONFIG_CPU_FEROCEON) | 113 | #if defined(CONFIG_CPU_FEROCEON) |
| 98 | # define MULTI_CACHE 1 | 114 | # define MULTI_CACHE 1 |
| 99 | #endif | 115 | #endif |