diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
| commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 (patch) | |
| tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /arch/arm/include/asm/glue-cache.h | |
| parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 (diff) | |
| parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/include/asm/glue-cache.h')
| -rw-r--r-- | arch/arm/include/asm/glue-cache.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h index 2d6a7de87a8..cca9f15704e 100644 --- a/arch/arm/include/asm/glue-cache.h +++ b/arch/arm/include/asm/glue-cache.h | |||
| @@ -110,19 +110,19 @@ | |||
| 110 | #endif | 110 | #endif |
| 111 | 111 | ||
| 112 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) | 112 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) |
| 113 | //# ifdef _CACHE | 113 | # ifdef _CACHE |
| 114 | # define MULTI_CACHE 1 | 114 | # define MULTI_CACHE 1 |
| 115 | //# else | 115 | # else |
| 116 | //# define _CACHE v6 | 116 | # define _CACHE v6 |
| 117 | //# endif | 117 | # endif |
| 118 | #endif | 118 | #endif |
| 119 | 119 | ||
| 120 | #if defined(CONFIG_CPU_V7) | 120 | #if defined(CONFIG_CPU_V7) |
| 121 | //# ifdef _CACHE | 121 | # ifdef _CACHE |
| 122 | # define MULTI_CACHE 1 | 122 | # define MULTI_CACHE 1 |
| 123 | //# else | 123 | # else |
| 124 | //# define _CACHE v7 | 124 | # define _CACHE v7 |
| 125 | //# endif | 125 | # endif |
| 126 | #endif | 126 | #endif |
| 127 | 127 | ||
| 128 | #if !defined(_CACHE) && !defined(MULTI_CACHE) | 128 | #if !defined(_CACHE) && !defined(MULTI_CACHE) |