Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d6c2420 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: rename _return_from_exception to _bfin_return_from_exception and export it 



Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent d0025e5e

arch/blackfin/kernel/bfin_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ EXPORT_SYMBOL(__down_trylock); 
EXPORT_SYMBOL(__down_interruptible);



EXPORT_SYMBOL(is_in_rom);

EXPORT_SYMBOL(bfin_return_from_exception);



/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial_copy);

arch/blackfin/mach-common/entry.S

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ ENTRY(_ex_workaround_261) 
	r6 = retx;

	[p5] = r6;

	cc = r6 == r7;

	if !cc jump _return_from_exception;

	if !cc jump _bfin_return_from_exception;

	/* fall through */

	R7 = P4;

	R6 = 0x26;	/* Data CPLB Miss */
@@ -139,7 +139,7 @@ ENTRY(_ex_single_step) 
	r7 = retx;

	r6 = reti;

	cc = r7 == r6;

	if cc jump _return_from_exception

	if cc jump _bfin_return_from_exception

	r7 = syscfg;

	bitclr (r7, 0);

	syscfg = R7;
@@ -157,7 +157,7 @@ ENTRY(_ex_single_step) 
	cc = r6 == r7;

	if !cc jump _ex_trap_c;



ENTRY(_return_from_exception)

ENTRY(_bfin_return_from_exception)

	DEBUG_START_HWTRACE(p5, r7)

#if ANOMALY_05000257

	R7=LC0;
@@ -862,7 +862,7 @@ ENTRY(_ex_trace_buff_full) 
	LC0 = [sp++];

	P2 = [sp++];

	P3 = [sp++];

	jump _return_from_exception;

	jump _bfin_return_from_exception;

ENDPROC(_ex_trace_buff_full)



#if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4

include/asm-blackfin/bfin-global.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ extern void bfin_dcache_init(void); 
extern int read_iloc(void);

extern int bfin_console_init(void);

extern asmlinkage void lower_to_irq14(void);

extern asmlinkage void bfin_return_from_exception(void);

extern void init_exception_vectors(void);

extern void init_dma(void);

extern void program_IAR(void);