[PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels

Simon Horman horms at verge.net.au
Fri Apr 2 10:53:55 BST 2021


On Tue, Feb 23, 2021 at 06:32:39PM +0800, Kairui Song wrote:
> On 2/5/21 4:15 PM, Federico Pellegrin wrote:
> > kexec build will fail on older kernels (pre 4.4) as the define
> > VIDEO_CAPABILITY_64BIT_BASE was not present at that time.
> > 
> > This patch adds it, as per linux/include/uapi/linux/screen_info.h,
> > if not present.
> > 
> > Signed-off-by: Federico Pellegrin <fede at evolware.org>
> > ---
> >   kexec/arch/i386/x86-linux-setup.c | 4 ++++
> >   1 file changed, 4 insertions(+)
> > 
> > diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
> > index 76e1185..ab54a4a 100644
> > --- a/kexec/arch/i386/x86-linux-setup.c
> > +++ b/kexec/arch/i386/x86-linux-setup.c
> > @@ -37,6 +37,10 @@
> >   #include "x86-linux-setup.h"
> >   #include "../../kexec/kexec-syscall.h"
> > +#ifndef VIDEO_CAPABILITY_64BIT_BASE
> > +#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1)	/* Frame buffer base is 64-bit */
> > +#endif
> > +
> >   void init_linux_parameters(struct x86_linux_param_header *real_mode)
> >   {
> >   	/* Fill in the values that are usually provided by the kernel. */
> 
> Thanks for the fix, I didn't notice pre 4.4 kernels don't have this defined
> when I submitted that patch.
> 
> Reviewed-by: Kairui Song <kasong at redhat.com>

Thanks, applied.



More information about the kexec mailing list