aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/relocate_kernel.S
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-18 04:49:45 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-03-18 05:44:32 -0400
commite4e063d0c288bd65c56dd855337780a541ed928d (patch)
tree88ac50d334c002a60861d92afc5a849b8e26b48f /arch/sh/kernel/relocate_kernel.S
parent7be5c55af0cc58e54e42e1702d837527e15b8414 (diff)
sh: rework kexec segment code
Rework the kexec code to avoid using P2SEG. Instead we walk the page list in machine_kexec() and convert the addresses from physical to virtual using C. 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.S6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/kernel/relocate_kernel.S b/arch/sh/kernel/relocate_kernel.S
index 8b50b2c873a4..2a6630be668c 100644
--- a/arch/sh/kernel/relocate_kernel.S
+++ b/arch/sh/kernel/relocate_kernel.S
@@ -18,7 +18,6 @@ relocate_new_kernel:
18 /* r6 = start_address */ 18 /* r6 = start_address */
19 19
20 mov.l 10f,r8 /* PAGE_SIZE */ 20 mov.l 10f,r8 /* PAGE_SIZE */
21 mov.l 11f,r9 /* P2SEG */
22 21
23 /* stack setting */ 22 /* stack setting */
24 add r8,r5 23 add r8,r5
@@ -29,9 +28,8 @@ relocate_new_kernel:
290: 280:
30 mov.l @r4+,r0 /* cmd = *ind++ */ 29 mov.l @r4+,r0 /* cmd = *ind++ */
31 30
321: /* addr = (cmd | P2SEG) & 0xfffffff0 */ 311: /* addr = cmd & 0xfffffff0 */
33 mov r0,r2 32 mov r0,r2
34 or r9,r2
35 mov #-16,r1 33 mov #-16,r1
36 and r1,r2 34 and r1,r2
37 35
@@ -85,8 +83,6 @@ relocate_new_kernel:
85 .align 2 83 .align 2
8610: 8410:
87 .long PAGE_SIZE 85 .long PAGE_SIZE
8811:
89 .long P2SEG
90 86
91relocate_new_kernel_end: 87relocate_new_kernel_end:
92 88