Commit 457d2fc5 authored by Jinyang He's avatar Jinyang He Committed by Thomas Bogendoerfer
Browse files

MIPS: relocatable: Use __kaslr_offset in show_kernel_relocation 



The type of the VMLINUX_LOAD_ADDRESS macro is the (unsigned long long)
in 32bits kernel but (unsigned long) in the 64-bit kernel. Although there
is no error here, avoid using it to calculate kaslr_offset.

Signed-off-by: default avatarJinyang He <hejinyang@loongson.cn>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent d4d3ef8b

arch/mips/kernel/relocate.c

+2 −6
Original line number Diff line number Diff line
@@ -430,13 +430,9 @@ void *__init relocate_kernel(void) 
 */

static void show_kernel_relocation(const char *level)

{

	unsigned long offset;



	offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);



	if (IS_ENABLED(CONFIG_RELOCATABLE) && offset > 0) {

	if (__kaslr_offset > 0) {

		printk(level);

		pr_cont("Kernel relocated by 0x%pK\n", (void *)offset);

		pr_cont("Kernel relocated by 0x%pK\n", (void *)__kaslr_offset);

		pr_cont(" .text @ 0x%pK\n", _text);

		pr_cont(" .data @ 0x%pK\n", _sdata);

		pr_cont(" .bss  @ 0x%pK\n", __bss_start);