Merge branch 'for-next/asm-annotations' into for-next/core

* for-next/asm-annotations: (6 commits)
  arm64: kernel: Correct annotation of end of el0_sync
  ...

diff --cc arch/arm64/include/asm/assembler.h
Simple merge

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/lib/copy_page.S
index 290dd3c,e125a84..e7a7939
--- 1/arch/arm64/lib/copy_page.S
--- 2/arch/arm64/lib/copy_page.S
+++ b/arch/arm64/lib/copy_page.S
@@@ -63,17 -63,17 +63,17 @@@ alternative_else_nop_endi
        add     x0, x0, #128
        add     x1, x1, #128
  
 -      b.gt    1b
 +      b.ne    1b
  
 -      stnp    x2, x3, [x0]
 -      stnp    x4, x5, [x0, #16]
 -      stnp    x6, x7, [x0, #32]
 -      stnp    x8, x9, [x0, #48]
 -      stnp    x10, x11, [x0, #64]
 -      stnp    x12, x13, [x0, #80]
 -      stnp    x14, x15, [x0, #96]
 -      stnp    x16, x17, [x0, #112]
 +      stnp    x2, x3, [x0, #-256]
 +      stnp    x4, x5, [x0, #16 - 256]
 +      stnp    x6, x7, [x0, #32 - 256]
 +      stnp    x8, x9, [x0, #48 - 256]
 +      stnp    x10, x11, [x0, #64 - 256]
 +      stnp    x12, x13, [x0, #80 - 256]
 +      stnp    x14, x15, [x0, #96 - 256]
 +      stnp    x16, x17, [x0, #112 - 256]
  
        ret
- ENDPROC(copy_page)
+ SYM_FUNC_END(copy_page)
  EXPORT_SYMBOL(copy_page)

diff --cc arch/arm64/mm/proc.S
index da854bd,9a8b1b1..aafed69
--- 1/arch/arm64/mm/proc.S
--- 2/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@@ -399,9 -376,24 +399,9 @@@ __idmap_kpti_secondary
        isb
        ret
  
 -      .unreq  cpu
 -      .unreq  num_cpus
 -      .unreq  swapper_pa
        .unreq  swapper_ttb
        .unreq  flag_ptr
- ENDPROC(idmap_kpti_install_ng_mappings)
 -      .unreq  cur_pgdp
 -      .unreq  end_pgdp
 -      .unreq  pgd
 -      .unreq  cur_pudp
 -      .unreq  end_pudp
 -      .unreq  pud
 -      .unreq  cur_pmdp
 -      .unreq  end_pmdp
 -      .unreq  pmd
 -      .unreq  cur_ptep
 -      .unreq  end_ptep
 -      .unreq  pte
+ SYM_FUNC_END(idmap_kpti_install_ng_mappings)
        .popsection
  #endif