| Message ID | 1458024458-19206-1-git-send-email-oss@buserror.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-15-03 at 06:47:38 UTC, Scott Wood wrote: > This preserves the ability to build using older binutils (reportedly <= > 2.22). > > Signed-off-by: Scott Wood <oss@buserror.net> > Cc: chenhui.zhao@freescale.com Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/7a25d91214cb22e642b9ed6e44 cheers
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 2916283..4286775 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -41,6 +41,7 @@ #include <asm/ptrace.h> #include <asm/hw_irq.h> #include <asm/cputhreads.h> +#include <asm/ppc-opcode.h> /* The physical memory is laid out such that the secondary processor * spin code sits at 0x0000...0x00ff. On server, the vectors follow @@ -207,12 +208,12 @@ _GLOBAL(book3e_start_thread) /* If the thread id is invalid, just exit. */ b 13f 10: - mttmr TMRN_IMSR0, r5 - mttmr TMRN_INIA0, r4 + MTTMR(TMRN_IMSR0, 5) + MTTMR(TMRN_INIA0, 4) b 12f 11: - mttmr TMRN_IMSR1, r5 - mttmr TMRN_INIA1, r4 + MTTMR(TMRN_IMSR1, 5) + MTTMR(TMRN_INIA1, 4) 12: isync li r6, 1
This preserves the ability to build using older binutils (reportedly <= 2.22). Signed-off-by: Scott Wood <oss@buserror.net> Cc: chenhui.zhao@freescale.com --- arch/powerpc/kernel/head_64.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)