diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-02 09:17:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-02 09:17:09 +0100 |
| commit | a67e1ce145785d884b29b17e4d82a6ecd67bb97a (patch) | |
| tree | e36cfe427b06ff96646d2753d71c99b91277a78a /arch | |
| parent | 195bbcac2e5c12f7fb99cdcc492c3000c5537f4a (diff) | |
| download | linux-3.10-a67e1ce145785d884b29b17e4d82a6ecd67bb97a.tar.gz linux-3.10-a67e1ce145785d884b29b17e4d82a6ecd67bb97a.tar.bz2 linux-3.10-a67e1ce145785d884b29b17e4d82a6ecd67bb97a.zip | |
ARM: Fix bad merge bd1274dc005 (Merge branch 'v6v7' into devel)
Commit 774c096bf9e49 (ARM: v6/v7 cache: allow cache calls to be
optimized) got dropped when the merge conflicts for moving the contents
of the files in commit 753790e713d (ARM: move cache/processor/fault
glue to separate include files) was fixed up in merge bd1274dc005
(Merge branch 'v6v7' into devel).
This puts the change back.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -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 7e30874377e..4f8d2c0dc44 100644 --- a/arch/arm/include/asm/glue-cache.h +++ b/arch/arm/include/asm/glue-cache.h @@ -110,19 +110,19 @@ #endif #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) -//# ifdef _CACHE +# ifdef _CACHE # define MULTI_CACHE 1 -//# else -//# define _CACHE v6 -//# endif +# else +# define _CACHE v6 +# endif #endif #if defined(CONFIG_CPU_V7) -//# ifdef _CACHE +# ifdef _CACHE # define MULTI_CACHE 1 -//# else -//# define _CACHE v7 -//# endif +# else +# define _CACHE v7 +# endif #endif #if !defined(_CACHE) && !defined(MULTI_CACHE) |