提交 959eaa74 编写于 作者: B Benoît Thébaudeau 提交者: Albert ARIBAUD

arm: relocate_code() is no longer noreturn

Commit e05e5de7 made ARM's relocate_code()
return to its caller, but it did not update its declaration accordingly.

Fixing this function declaration fixes dropped C code following calls to
relocate_code().
Signed-off-by: NBenoît Thébaudeau <benoit.thebaudeau@advansee.com>
上级 508611bc
......@@ -176,9 +176,7 @@ next:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -239,9 +239,7 @@ skip_tcmdisable:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -154,9 +154,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -193,9 +193,7 @@ copyex:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -183,9 +183,7 @@ poll1:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -200,9 +200,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -158,9 +158,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -154,9 +154,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -167,9 +167,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
ENTRY(relocate_code)
mov r4, r0 /* save addr_sp */
......
......@@ -256,9 +256,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -171,9 +171,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -139,9 +139,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -143,9 +143,7 @@ reset:
/*
* void relocate_code (addr_sp, gd, addr_moni)
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
* This function relocates the monitor code.
*/
.globl relocate_code
relocate_code:
......
......@@ -530,7 +530,11 @@ int dcache_status (void);
void dcache_enable (void);
void dcache_disable(void);
void mmu_disable(void);
void relocate_code (ulong, gd_t *, ulong) __attribute__ ((noreturn));
void relocate_code(ulong, gd_t *, ulong)
#if !defined(CONFIG_ARM)
__attribute__ ((noreturn))
#endif
;
ulong get_endaddr (void);
void trap_init (ulong);
#if defined (CONFIG_4xx) || \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册