Commit 030b3ffb authored by Sam Edwards's avatar Sam Edwards Committed by Will Deacon
Browse files

arm64: mm: Cast start/end markers to char *, not u64 



There are a few memset() calls in map_kernel.c that cast marker-symbol
addresses to u64 in order to perform pointer subtraction (range size
computation).

Cast them with (char *) instead, aligning with idiomatic C pointer
arithmetic.

This patch provably has no effect at runtime: I have verified that
.text of vmlinux is identical after this change.

Signed-off-by: default avatarSam Edwards <CFSworks@gmail.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 8f5ae30d

arch/arm64/kernel/pi/map_kernel.c

+3 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static void __init remap_idmap_for_lpa2(void) 
	 * Don't bother with the FDT, we no longer need it after this.

	 */

	memset(init_idmap_pg_dir, 0,

	       (u64)init_idmap_pg_end - (u64)init_idmap_pg_dir);

	       (char *)init_idmap_pg_end - (char *)init_idmap_pg_dir);



	create_init_idmap(init_idmap_pg_dir, mask);

	dsb(ishst);
@@ -188,7 +188,7 @@ static void __init remap_idmap_for_lpa2(void) 
	set_ttbr0_for_lpa2((u64)init_idmap_pg_dir);



	/* wipe the temporary ID map from memory */

	memset(init_pg_dir, 0, (u64)init_pg_end - (u64)init_pg_dir);

	memset(init_pg_dir, 0, (char *)init_pg_end - (char *)init_pg_dir);

}



static void __init map_fdt(u64 fdt)
@@ -242,7 +242,7 @@ asmlinkage void __init early_map_kernel(u64 boot_status, void *fdt) 
	map_fdt((u64)fdt);



	/* Clear BSS and the initial page tables */

	memset(__bss_start, 0, (u64)init_pg_end - (u64)__bss_start);

	memset(__bss_start, 0, (char *)init_pg_end - (char *)__bss_start);



	/* Parse the command line for CPU feature overrides */

	chosen = fdt_path_offset(fdt, chosen_str);