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

Commit a6bab7b5 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: kexec: Drop SR.BL bit toggling. 



For the time being, this creates far more problems than it solves,
evident by the second local_irq_disable(). Kill all of this off
and rely on IRQ disabling to protect against the VBR reload.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b7cf6ddc

arch/sh/kernel/machine_kexec.c

+3 −4
Original line number Diff line number Diff line
@@ -113,20 +113,19 @@ void machine_kexec(struct kimage *image) 
	kexec_info(image);

	flush_cache_all();



	set_bl_bit();

#if defined(CONFIG_SH_STANDARD_BIOS)

	asm volatile("ldc %0, vbr" :

		     : "r" (((unsigned long) gdb_vbr_vector) - 0x100)

		     : "memory");

#endif



	/* now call it */

	rnk = (relocate_new_kernel_t) reboot_code_buffer;

	(*rnk)(page_list, reboot_code_buffer, image->start);



#ifdef CONFIG_KEXEC_JUMP

	asm volatile("ldc %0, vbr" : : "r" (&vbr_base) : "memory");

	local_irq_disable();

	clear_bl_bit();



	if (image->preserve_context)

		restore_processor_state();