From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Date: Wed, 18 Mar 2009 05:34:52 +0000 Subject: [PATCH] sh: use P1 instead of P2 for kexec Message-Id: <20090318053452.4078.65405.sendpatchset@rx1.opensource.se> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org From: Magnus Damm Use P1 instead of P2 to enable cache when moving data in the kexec assembly snippet. Signed-off-by: Magnus Damm --- Q: Maybe we need to flush data cache before jumping? arch/sh/kernel/machine_kexec.c | 2 +- arch/sh/kernel/relocate_kernel.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) --- 0005/arch/sh/kernel/machine_kexec.c +++ work/arch/sh/kernel/machine_kexec.c 2009-03-18 11:44:45.000000000 +0900 @@ -100,7 +100,7 @@ void machine_kexec(struct kimage *image) #endif /* now call it */ rnk = (relocate_new_kernel_t) reboot_code_buffer; - (*rnk)(page_list, reboot_code_buffer, P2SEGADDR(image->start)); + (*rnk)(page_list, reboot_code_buffer, P1SEGADDR(image->start)); } void arch_crash_save_vmcoreinfo(void) --- 0005/arch/sh/kernel/relocate_kernel.S +++ work/arch/sh/kernel/relocate_kernel.S 2009-03-18 11:45:14.000000000 +0900 @@ -18,7 +18,7 @@ relocate_new_kernel: /* r6 = start_address */ mov.l 10f,r8 /* PAGE_SIZE */ - mov.l 11f,r9 /* P2SEG */ + mov.l 11f,r9 /* P1SEG */ /* stack setting */ add r8,r5 @@ -29,7 +29,7 @@ relocate_new_kernel: 0: mov.l @r4+,r0 /* cmd = *ind++ */ -1: /* addr = (cmd | P2SEG) & 0xfffffff0 */ +1: /* addr = (cmd | P1SEG) & 0xfffffff0 */ mov r0,r2 or r9,r2 mov #-16,r1 @@ -86,7 +86,7 @@ relocate_new_kernel: 10: .long PAGE_SIZE 11: - .long P2SEG + .long P1SEG relocate_new_kernel_end: