Commit a67e1ce1 authored Sep 02, 2012 by Russell King

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



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

This puts the change back.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 195bbcac

arch/arm/include/asm/glue-cache.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -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)