Commit 9b78442f authored Nov 18, 2008 by Mike Frysinger Committed by Bryan Wu Nov 18, 2008

Blackfin arch: rename cache_lock() to bfin_cache_lock()



rename cache_lock() to bfin_cache_lock() to avoid namespace collision
with common code

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

parent a3765e0c

arch/blackfin/include/asm/bfin-global.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;

		#ifdef CONFIG_BFIN_ICACHE_LOCK
		extern void cache_grab_lock(int way);
		extern void cache_lock(int way);
		extern void bfin_cache_lock(int way);
		#endif

		#endif

arch/blackfin/mach-common/lock.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ ENDPROC(_cache_grab_lock)
		* R0 - Which way to be locked
		*/

		ENTRY(_cache_lock)
		ENTRY(_bfin_cache_lock)

		[--SP]=( R7:0,P5:0 );

		@@ -184,7 +184,7 @@ ENTRY(_cache_lock)

		( R7:0,P5:0 ) = [SP++];
		RTS;
		ENDPROC(_cache_lock)
		ENDPROC(_bfin_cache_lock)

		/* Invalidate the Entire Instruction cache by
		* disabling IMC bit