Messages in this thread Patch in this message | | | Date | Mon, 28 Jul 2008 22:14:44 +0900 | From | Paul Mundt <> | Subject | Re: sh kexec build error |
| |
On Mon, Jul 28, 2008 at 04:06:13PM +0300, Adrian Bunk wrote: > Commit 3ab83521378268044a448113c6aa9a9e245f4d2f (kexec jump) > causes the following build error on sh: > > <-- snip --> > > ... > CC kernel/kexec.o > {standard input}: Assembler messages: > {standard input}:1518: Error: offset to unaligned destination > make[2]: *** [kernel/kexec.o] Error 1 > > <-- snip --> > > If I understand the assembler correctly it fails at > include/asm-sh/kexec.h:59 > Indeed. This should fix it:
---
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h index c6583f2..0dadd75 100644 --- a/include/asm-sh/processor_32.h +++ b/include/asm-sh/processor_32.h @@ -19,7 +19,7 @@ * Default implementation of macro that returns current * instruction pointer ("program counter"). */ -#define current_text_addr() ({ void *pc; __asm__("mova 1f, %0\n1:":"=z" (pc)); pc; }) +#define current_text_addr() ({ void *pc; __asm__("mova 1f, %0\n.align 2\n1:":"=z" (pc)); pc; }) /* Core Processor Version Register */ #define CCN_PVR 0xff000030
| |