Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c787940d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Fix text patching logic"

parents e11e8c67 086377ed

arch/arm64/kernel/insn.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static void __kprobes *patch_map(void *addr, int fixmap) 


	if (module && IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX))

		page = vmalloc_to_page(addr);

	else if (!module && IS_ENABLED(CONFIG_DEBUG_RODATA))

	else if (!module && (IS_ENABLED(CONFIG_DEBUG_RODATA) ||

			IS_ENABLED(CONFIG_KERNEL_TEXT_RDONLY)))

		page = virt_to_page(addr);

	else

		return addr;