From 22dcde8a96ee8fca9d8db5e48de5e75a6b830d73 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Wed, 18 Mar 2009 08:47:31 +0000
Subject: [PATCH] --- yaml --- r: 133343 b: refs/heads/master c:
 7be5c55af0cc58e54e42e1702d837527e15b8414 h: refs/heads/master i:   133341:
 e62e29501dbdf4970849bf4a81bd7fbd197b26a9   133339:
 b6b673ee81447ac7477eaebd65fa64481735eeab   133335:
 935e0d105b69ff4e539f289a49579414f898aae6   133327:
 e26e954f799c39e2a1add6b2a2139fe8c8e69141   133311:
 128e0f68607b99df6d4e4e79cf29368727d078a2 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sh/kernel/machine_kexec.c   | 17 ++++++++---------
 trunk/arch/sh/kernel/relocate_kernel.S |  4 ----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2dd86111b3be..81be5287e1fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c20351846efcb755ba849d9fb701fbd9a1ffb7c2
+refs/heads/master: 7be5c55af0cc58e54e42e1702d837527e15b8414
diff --git a/trunk/arch/sh/kernel/machine_kexec.c b/trunk/arch/sh/kernel/machine_kexec.c
index 94df56b0d1f6..d3318f99256b 100644
--- a/trunk/arch/sh/kernel/machine_kexec.c
+++ b/trunk/arch/sh/kernel/machine_kexec.c
@@ -23,8 +23,7 @@
 typedef NORET_TYPE void (*relocate_new_kernel_t)(
 				unsigned long indirection_page,
 				unsigned long reboot_code_buffer,
-				unsigned long start_address,
-				unsigned long vbr_reg) ATTRIB_NORET;
+				unsigned long start_address) ATTRIB_NORET;
 
 extern const unsigned char relocate_new_kernel[];
 extern const unsigned int relocate_new_kernel_size;
@@ -76,14 +75,8 @@ void machine_kexec(struct kimage *image)
 
 	unsigned long page_list;
 	unsigned long reboot_code_buffer;
-	unsigned long vbr_reg;
 	relocate_new_kernel_t rnk;
 
-#if defined(CONFIG_SH_STANDARD_BIOS)
-	vbr_reg = ((unsigned long )gdb_vbr_vector) - 0x100;
-#else
-	vbr_reg = 0x80000000;  // dummy
-#endif
 	/* Interrupts aren't acceptable while we reboot */
 	local_irq_disable();
 
@@ -100,9 +93,15 @@ 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, P2SEGADDR(image->start), vbr_reg);
+	(*rnk)(page_list, reboot_code_buffer, P2SEGADDR(image->start));
 }
 
 void arch_crash_save_vmcoreinfo(void)
diff --git a/trunk/arch/sh/kernel/relocate_kernel.S b/trunk/arch/sh/kernel/relocate_kernel.S
index c66cb3209db5..8b50b2c873a4 100644
--- a/trunk/arch/sh/kernel/relocate_kernel.S
+++ b/trunk/arch/sh/kernel/relocate_kernel.S
@@ -16,7 +16,6 @@ relocate_new_kernel:
 	/* r4 = indirection_page   */
 	/* r5 = reboot_code_buffer */
 	/* r6 = start_address      */
-	/* r7 = vbr_reg            */
 
 	mov.l	10f,r8	  /* PAGE_SIZE */
 	mov.l	11f,r9    /* P2SEG */
@@ -80,9 +79,6 @@ relocate_new_kernel:
 	bra	0b
 	nop
 6:
-#ifdef CONFIG_SH_STANDARD_BIOS
-	ldc   r7, vbr
-#endif
 	jmp @r6
 	nop