diff options
| author | Trilok Soni <tsoni@codeaurora.org> | 2016-08-25 19:05:37 -0700 |
|---|---|---|
| committer | Trilok Soni <tsoni@codeaurora.org> | 2016-08-26 14:34:05 -0700 |
| commit | 5ab1e18aa3913d454e1bd1498b20ee581aae2c6b (patch) | |
| tree | 42bd10ef0bf5cdb8deb05656bf802c77dc580ff7 /arch/arm64/include/asm/assembler.h | |
| parent | e97b6a0e0217f7c072fdad6c50673cd7a64348e1 (diff) | |
Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"
This reverts commit 9d6fd2c3e9fcfb ("Merge remote-tracking branch
'msm-4.4/tmp-510d0a3f' into msm-4.4"), because it breaks the
dump parsing tools due to kernel can be loaded anywhere in the memory
now and not fixed at linear mapping.
Change-Id: Id416f0a249d803442847d09ac47781147b0d0ee6
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
Diffstat (limited to 'arch/arm64/include/asm/assembler.h')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index fcaf3cce639a..09f13a96941b 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -106,19 +106,12 @@ dmb \opt .endm -/* - * Emit an entry into the exception table - */ - .macro _asm_extable, from, to - .pushsection __ex_table, "a" - .align 3 - .long (\from - .), (\to - .) - .popsection - .endm - #define USER(l, x...) \ 9999: x; \ - _asm_extable 9999b, l + .section __ex_table,"a"; \ + .align 3; \ + .quad 9999b,l; \ + .previous /* * Register aliases. @@ -212,17 +205,6 @@ lr .req x30 // link register str \src, [\tmp, :lo12:\sym] .endm - /* - * @sym: The name of the per-cpu variable - * @reg: Result of per_cpu(sym, smp_processor_id()) - * @tmp: scratch register - */ - .macro this_cpu_ptr, sym, reg, tmp - adr_l \reg, \sym - mrs \tmp, tpidr_el1 - add \reg, \reg, \tmp - .endm - /* * Annotate a function as position independent, i.e., safe to be called before * the kernel virtual mapping is activated. @@ -234,15 +216,4 @@ lr .req x30 // link register .size __pi_##x, . - x; \ ENDPROC(x) - /* - * Emit a 64-bit absolute little endian symbol reference in a way that - * ensures that it will be resolved at build time, even when building a - * PIE binary. This requires cooperation from the linker script, which - * must emit the lo32/hi32 halves individually. - */ - .macro le64sym, sym - .long \sym\()_lo32 - .long \sym\()_hi32 - .endm - #endif /* __ASM_ASSEMBLER_H */ |