On Fri, Feb 28, 2020 at 01:41:21PM +0100, Ard Biesheuvel wrote: > On Tue, 18 Feb 2020 at 21:02, Mark Brown <broonie@xxxxxxxxxx> wrote: > > In an effort to clarify and simplify the annotation of assembly functions > > in the kernel new macros have been introduced. These replace ENTRY and > > ENDPROC and also add a new annotation for static functions which previously > > had no ENTRY equivalent. Update the annotations in the core kernel code to > > the new macros. > > > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > > --- > > arch/arm64/kernel/cpu-reset.S | 4 +- > > arch/arm64/kernel/efi-entry.S | 4 +- > > arch/arm64/kernel/efi-rt-wrapper.S | 4 +- > > arch/arm64/kernel/entry-fpsimd.S | 20 ++++----- > > arch/arm64/kernel/hibernate-asm.S | 16 +++---- > > arch/arm64/kernel/hyp-stub.S | 20 ++++----- > > arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- > > arch/arm64/kernel/reloc_test_syms.S | 44 +++++++++---------- > > arch/arm64/kernel/relocate_kernel.S | 4 +- > > arch/arm64/kernel/sleep.S | 12 ++--- > > arch/arm64/kernel/smccc-call.S | 8 ++-- > > 11 files changed, 70 insertions(+), 70 deletions(-) > > > ... > > diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S > > index 304d5b02ca67..de6ced92950e 100644 > > --- a/arch/arm64/kernel/efi-entry.S > > +++ b/arch/arm64/kernel/efi-entry.S > > @@ -25,7 +25,7 @@ > > * we want to be. The kernel image wants to be placed at TEXT_OFFSET > > * from start of RAM. > > */ > > -ENTRY(entry) > > +SYM_CODE_START(entry) > > /* > > * Create a stack frame to save FP/LR with extra space > > * for image_addr variable passed to efi_entry(). > > @@ -117,4 +117,4 @@ efi_load_fail: > > ret > > > > entry_end: > > -ENDPROC(entry) > > +SYM_CODE_END(entry) > > This hunk is going to conflict badly with the EFI tree. I will > incorporate this change for v5.7, so could you please just drop it > from this patch? I wonder whether it would be easier to merge all these patches at 5.7-rc1, once most of the major changes went in. -- Catalin _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
