On Mon, Aug 14, 2017 at 06:13:39PM +0100, Catalin Marinas wrote:
> On Mon, Aug 07, 2017 at 07:36:01PM +0100, Mark Rutland wrote:
> > .macro adr_this_cpu, dst, sym, tmp
> > - adr_l \dst, \sym
> > + adrp \tmp, \sym
> > + add \dst, \tmp, #:lo12:\sym
> > mrs \tmp, tpidr_el1
> > add \dst, \dst, \tmp
> > .endm
>
> Nitpick: it may be worth adding an #ifndef MODULE around these macros,
> together with a comment, just in case. There are other macros in this
> file like adr_l which are used in modules (crypto).
I've folded in the below, in keeping with the other MODULE fallbacks.
Thanks,
Mark.
---->8----
diff --git a/arch/arm64/include/asm/assembler.h
b/arch/arm64/include/asm/assembler.h
index 4775af5..50c5592 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -230,13 +230,18 @@
.endm
/*
- * @dst: Result of per_cpu(sym, smp_processor_id())
+ * @dst: Result of per_cpu(sym, smp_processor_id()), can be SP for
+ * non-module code
* @sym: The name of the per-cpu variable
* @tmp: scratch register
*/
.macro adr_this_cpu, dst, sym, tmp
+#ifndef MODULE
adrp \tmp, \sym
add \dst, \tmp, #:lo12:\sym
+#else
+ adr_l \tmp, \sym
+#endif
mrs \tmp, tpidr_el1
add \dst, \dst, \tmp
.endm
