Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

[Ard Biesheuvel]

On Fri, 15 Sept 2023 at 11:15, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
>
>
> * Ard Biesheuvel <ardb@xxxxxxxxxx> wrote:
>
> > From: Ard Biesheuvel <ardb@xxxxxxxxxx>
> >
> > The x86 boot image generation tool assign a default value to startup_64
> > and subsequently parses the actual value from zoffset.h but it never
> > actually uses the value anywhere. So remove this code.
> >
> > This change has no impact on the resulting bzImage binary.
> >
> > Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
> > ---
> >  arch/x86/boot/Makefile      | 2 +-
> >  arch/x86/boot/tools/build.c | 3 ---
> >  2 files changed, 1 insertion(+), 4 deletions(-)
>
> Note that this patch conflicted with a recent upstream cleanup commit:
>
>    e78d334a5470 ("x86/boot: Mark global variables as static")
>
> It was trivial to resolve, but please double-check the result once I push
> out the new tip:x86/boot tree.
>

Ehm, I suspect something is going on with your workflow - did you
apply my patches out of order perhaps? (/me notes that you seem to
have omitted patches #7 and #9)

The patch you refer to is

commit e78d334a5470ead861590ec83158f3b17bd6c807
Author:     Arvind Sankar <nivedita@xxxxxxxxxxxx>
AuthorDate: Mon May 11 18:58:49 2020 -0400
Commit:     Ard Biesheuvel <ardb@xxxxxxxxxx>
CommitDate: Thu May 14 11:11:20 2020 +0200

    x86/boot: Mark global variables as static

which went into v5.7 as a late fix via the EFI tree.