Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*

[Youling Tang]

Hi, Ard

On 11/19/2020 03:18 PM, Ard Biesheuvel wrote:
> On Thu, 19 Nov 2020 at 02:45, Youling Tang <tangyouling@xxxxxxxxxxx> wrote:
> > We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
> > in the line immediately following it. As the two section definitions are
> > identical, the latter is redundant and can be dropped.
> >
> > This patch drops the redundant *.init.rodata.* section definition.
> >
> > Signed-off-by: Youling Tang <tangyouling@xxxxxxxxxxx>
> .init.rodata.* was added to INIT_DATA in
> 266ff2a8f51f02b429a987d87634697eb0d01d6a, so removing it here seems
> reasonable. However, it does conflict with the for-next/lto branch in
> the arm64 tree.
The possible causes of the conflict are e35123d83ee submit.

master branch code as follows:
    ...
    INIT_RAM_FS
    *(.init.rodata.* .init.bss)     /* from the EFI stub */

for-next/lto branch code as follows:
    ...
    INIT_RAM_FS
    *(.init.altinstructions .init.rodata.* .init.bss) /* from the EFI 
stub */

Thanks,
Youling
> > ---
> >   arch/arm64/kernel/vmlinux.lds.S | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> > index 1bda604..7dba3c4 100644
> > --- a/arch/arm64/kernel/vmlinux.lds.S
> > +++ b/arch/arm64/kernel/vmlinux.lds.S
> > @@ -201,7 +201,7 @@ SECTIONS
> >                  INIT_CALLS
> >                  CON_INITCALL
> >                  INIT_RAM_FS
> > -               *(.init.rodata.* .init.bss)     /* from the EFI stub */
> > +               *(.init.bss)    /* from the EFI stub */
> >          }
> >          .exit.data : {
> >                  EXIT_DATA
> > --
> > 2.1.0