Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Fix bad merge bd1274dc00 (Merge branch 'v6v7' into devel)

Browse Source 
Commit 774c096bf9 (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 753790e713 (ARM: move cache/processor/fault
glue to separate include files) was fixed up in merge bd1274dc00
(Merge branch 'v6v7' into devel).

This puts the change back.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-09-02 09:17:09 +01:00
parent 195bbcac2e
commit a67e1ce145
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/include/asm/glue-cache.h
View File

@ -110,19 +110,19 @@
#endif #endif
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
//# ifdef _CACHE # ifdef _CACHE
# define MULTI_CACHE 1 # define MULTI_CACHE 1
//# else # else
//# define _CACHE v6 # define _CACHE v6
//# endif # endif
#endif #endif
#if defined(CONFIG_CPU_V7) #if defined(CONFIG_CPU_V7)
//# ifdef _CACHE # ifdef _CACHE
# define MULTI_CACHE 1 # define MULTI_CACHE 1
//# else # else
//# define _CACHE v7 # define _CACHE v7
//# endif # endif
#endif #endif
#if !defined(_CACHE) && !defined(MULTI_CACHE) #if !defined(_CACHE) && !defined(MULTI_CACHE)