Subject: [PATCH] efi: stub: define DISABLE_BRANCH_PROFILING for all architectures

From: [email-masked] (Will Deacon)
Date: Wed, 6 Jan 2016 15:43:49 +0000

On Tue, Jan 05, 2016 at 05:51:14PM +0000, Will Deacon wrote:
> On Tue, Jan 05, 2016 at 03:39:18PM +0000, Matt Fleming wrote:
> > On Tue, 05 Jan, at 03:56:39PM, Ard Biesheuvel wrote:
> > > (+ Arnd)
> > > 
> > > On 4 January 2016 at 13:31, Will Deacon <[email-masked]> wrote:
> > > > On Wed, Dec 23, 2015 at 10:29:28AM +0100, Ard Biesheuvel wrote:
> > > >> This moves the DISABLE_BRANCH_PROFILING define from the x86 specific
> > > >> to the general CFLAGS definition for the stub. This fixes build errors
> > > >> when building for arm64 with CONFIG_PROFILE_ALL_BRANCHES_ENABLED.
> > > >>
> > > >> Reported-by: Will Deacon <[email-masked]>
> > > >> Signed-off-by: Ard Biesheuvel <[email-masked]>
> > > >> ---
> > > >>  drivers/firmware/efi/libstub/Makefile | 4 ++--
> > > >>  1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > Cheers, Ard. The kernel now builds and boots as an EFI application for
> > > > me when the dreaded #define if config option is enabled:
> > > >
> > > >   Tested-by: Will Deacon <[email-masked]>
> > > >
> > > > Will
> > > >
> > > 
> > > @Matt: this is causing randconfig build errors for ARM in -next. Mind
> > > if we take this through some other tree?
> > 
> > Go ahead.
> > 
> > Reviewed-by: Matt Fleming <[email-masked]>
> 
> I can take this via the arm64 tree, unless Arnd wants to queue it in
> arm-soc. Arnd?

Given that this fixes build errors, I've applied it in the arm64 tree,
so it should appear in -next soon.

Will