Gitweb: http://git.kernel.org/linus/a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc
Commit: a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc
Parent: b7cf6ddc13186f9272438a97aa75972d496d0b0a
Author: Paul Mundt <lethal@linux-sh.org>
AuthorDate: Wed Mar 18 19:06:15 2009 +0900
Committer: Paul Mundt <lethal@linux-sh.org>
CommitDate: Wed Mar 18 19:06:15 2009 +0900
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: Paul Mundt <lethal@linux-sh.org>
---
arch/sh/kernel/machine_kexec.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index c44efb7..69268c0 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -110,23 +110,22 @@ void machine_kexec(struct kimage *image)
memcpy((void *)reboot_code_buffer, relocate_new_kernel,
relocate_new_kernel_size);
- kexec_info(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();
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
