diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-03-18 08:49:45 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-18 18:44:32 +0900 |
| commit | e4e063d0c288bd65c56dd855337780a541ed928d (patch) | |
| tree | 88ac50d334c002a60861d92afc5a849b8e26b48f /arch/sh/kernel/relocate_kernel.S | |
| parent | 7be5c55af0cc58e54e42e1702d837527e15b8414 (diff) | |
| download | linux-e4e063d0c288bd65c56dd855337780a541ed928d.tar.gz linux-e4e063d0c288bd65c56dd855337780a541ed928d.tar.bz2 linux-e4e063d0c288bd65c56dd855337780a541ed928d.zip | |
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.S | 6 |
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: /* r6 = start_address */ mov.l 10f,r8 /* PAGE_SIZE */ - mov.l 11f,r9 /* P2SEG */ /* stack setting */ add r8,r5 @@ -29,9 +28,8 @@ relocate_new_kernel: 0: mov.l @r4+,r0 /* cmd = *ind++ */ -1: /* addr = (cmd | P2SEG) & 0xfffffff0 */ +1: /* addr = cmd & 0xfffffff0 */ mov r0,r2 - or r9,r2 mov #-16,r1 and r1,r2 @@ -85,8 +83,6 @@ relocate_new_kernel: .align 2 10: .long PAGE_SIZE -11: - .long P2SEG relocate_new_kernel_end: |