From 9b603d7411609ee68c89bf793c412721bdaba246 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 18 Mar 2009 19:06:15 +0900
Subject: [PATCH] --- yaml --- r: 133346 b: refs/heads/master c:
 a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sh/kernel/machine_kexec.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6165d58e5681..0f020278d689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7cf6ddc13186f9272438a97aa75972d496d0b0a
+refs/heads/master: a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc
diff --git a/trunk/arch/sh/kernel/machine_kexec.c b/trunk/arch/sh/kernel/machine_kexec.c
index c44efb73ab1a..69268c0d8063 100644
--- a/trunk/arch/sh/kernel/machine_kexec.c
+++ b/trunk/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();