From: Ovidiu Panait ovpanait@gmail.com

Existing debug output is mixed with the function name: initcall_run_list() initcall: 25263initcall_run_list() (relocated to 425263)

Turn it to: initcall_run_list() initcall: 25263 (relocated to 425263)

Signed-off-by: Ovidiu Panait ovpanait@gmail.com --- include/initcall.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/initcall.h b/include/initcall.h index 78d15afe69..b5acdd01bd 100644 --- a/include/initcall.h +++ b/include/initcall.h @@ -30,11 +30,13 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[]) #ifdef CONFIG_EFI_APP reloc_ofs = (unsigned long)image_base; #endif - debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs); if (reloc_ofs) - debug(" (relocated to %p)\n", (char *)*init_fnc_ptr); + debug("initcall: %p (relocated to %p)\n", + (char *)*init_fnc_ptr - reloc_ofs, + (char *)*init_fnc_ptr); else - debug("\n"); + debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs); + ret = (*init_fnc_ptr)(); if (ret) { printf("initcall sequence %p failed at call %p (err=%d)\n",