Skip to content

Commit 14be57c

Browse files
Gu Yuchenopsiff
authored andcommitted
sw64: fix the parameter passing logic of memblock_mark_nomap
Fix the parameter passing logic of memblock_mark_nomap and memblock_clear_nomap. Signed-off-by: Gu Yuchen <guyuchen@wxiat.com> Reviewed-by: He Sheng <hesheng@wxiat.com> Signed-off-by: Gu Zitao <guzitao@wxiat.com>
1 parent 18a41b0 commit 14be57c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

arch/sw_64/mm/init.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,7 @@ void __init paging_init(void)
613613
create_pgd_mapping(pgdir, sw64_guest_reset_start, __pa(sw64_guest_reset_start), sw64_guest_reset_size,
614614
PAGE_KERNEL_READONLY_EXEC, pgtable_alloc_fixmap);
615615

616-
memblock_mark_nomap(__pa(sw64_reserve_start),
617-
__pa((unsigned long)_end - sw64_reserve_start));
616+
memblock_mark_nomap(__pa(sw64_reserve_start), (unsigned long)_end - sw64_reserve_start);
618617
for_each_mem_range(i, &start, &end) {
619618
if (start >= end)
620619
break;
@@ -623,8 +622,7 @@ void __init paging_init(void)
623622
(unsigned long)(end - start),
624623
PAGE_KERNEL_NOEXEC, pgtable_alloc_fixmap);
625624
}
626-
memblock_clear_nomap(__pa(sw64_reserve_start),
627-
__pa((unsigned long)_end - sw64_reserve_start));
625+
memblock_clear_nomap(__pa(sw64_reserve_start), (unsigned long)_end - sw64_reserve_start);
628626

629627
map_fdt(pgdir);
630628
#endif /* CONFIG_SW64_KERNEL_PAGE_TABLE */

0 commit comments

Comments
 (0)