summaryrefslogtreecommitdiff
path: root/arch/sh/kernel/relocate_kernel.S
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-18 08:47:31 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-03-18 18:44:22 +0900
commit7be5c55af0cc58e54e42e1702d837527e15b8414 (patch)
tree87d6ecab0ff11b0b75053bf57ee462a99828f981 /arch/sh/kernel/relocate_kernel.S
parentc20351846efcb755ba849d9fb701fbd9a1ffb7c2 (diff)
sh: simplify kexec vbr code
Setup the vbr register in machine_kexec(). This instead of passing values to the assembly snippet. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/relocate_kernel.S')
-rw-r--r--arch/sh/kernel/relocate_kernel.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/kernel/relocate_kernel.S b/arch/sh/kernel/relocate_kernel.S
index c66cb3209db5..8b50b2c873a4 100644
--- a/arch/sh/kernel/relocate_kernel.S
+++ b/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