From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 25 Mar 2020 11:10:46 +0000 (+0000)
Subject: Merge branch 'for-next/asm-annotations' into for-next/core
X-Git-Tag: block-5.7-2020-04-09~29^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0829a076958ddd203cf4824dd330c93ba4662815;p=linux-block.git

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

* for-next/asm-annotations:
  : Modernise arm64 assembly annotations
  arm64: head: Convert install_el2_stub to SYM_INNER_LABEL
  arm64: Mark call_smc_arch_workaround_1 as __maybe_unused
  arm64: entry-ftrace.S: Fix missing argument for CONFIG_FUNCTION_GRAPH_TRACER=y
  arm64: vdso32: Convert to modern assembler annotations
  arm64: vdso: Convert to modern assembler annotations
  arm64: sdei: Annotate SDEI entry points using new style annotations
  arm64: kvm: Modernize __smccc_workaround_1_smc_start annotations
  arm64: kvm: Modernize annotation for __bp_harden_hyp_vecs
  arm64: kvm: Annotate assembly using modern annoations
  arm64: kernel: Convert to modern annotations for assembly data
  arm64: head: Annotate stext and preserve_boot_args as code
  arm64: head.S: Convert to modern annotations for assembly functions
  arm64: ftrace: Modernise annotation of return_to_handler
  arm64: ftrace: Correct annotation of ftrace_caller assembly
  arm64: entry-ftrace.S: Convert to modern annotations for assembly functions
  arm64: entry: Additional annotation conversions for entry.S
  arm64: entry: Annotate ret_from_fork as code
  arm64: entry: Annotate vector table and handlers as code
  arm64: crypto: Modernize names for AES function macros
  arm64: crypto: Modernize some extra assembly annotations
---

0829a076958ddd203cf4824dd330c93ba4662815
diff --cc arch/arm64/kernel/head.S
index f79023c9b374,cd7dcbe4bcb6..5fa9daa1d227
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@@ -403,7 -403,8 +403,7 @@@ SYM_FUNC_START_LOCAL(__create_page_tabl
  	bl	__inval_dcache_area
  
  	ret	x28
- ENDPROC(__create_page_tables)
+ SYM_FUNC_END(__create_page_tables)
 -	.ltorg
  
  /*
   * The following fragment of code is executed with the MMU enabled.