All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
@ 2021-02-05  8:15 Federico Pellegrin
  2021-02-07  8:00 ` Dave Young
  2021-02-23 10:32 ` Kairui Song
  0 siblings, 2 replies; 6+ messages in thread
From: Federico Pellegrin @ 2021-02-05  8:15 UTC (permalink / raw)
  To: kexec; +Cc: Federico Pellegrin

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@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. */
-- 
2.26.2


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
  2021-02-05  8:15 [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels Federico Pellegrin
@ 2021-02-07  8:00 ` Dave Young
  2021-02-19  4:29   ` Federico Pellegrin
  2021-02-23 10:32 ` Kairui Song
  1 sibling, 1 reply; 6+ messages in thread
From: Dave Young @ 2021-02-07  8:00 UTC (permalink / raw)
  To: Federico Pellegrin; +Cc: kexec, kasong

Added Kairui in cc since he contributed that part
On 02/05/21 at 09:15am, 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@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. */
> -- 
> 2.26.2
> 
> 
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
> 
> 


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
  2021-02-07  8:00 ` Dave Young
@ 2021-02-19  4:29   ` Federico Pellegrin
  0 siblings, 0 replies; 6+ messages in thread
From: Federico Pellegrin @ 2021-02-19  4:29 UTC (permalink / raw)
  To: Dave Young; +Cc: kexec, kasong

Hi,
Just trying my luck with a "ping", if someone could evaluate if the
patch seems correct and/or eventually merge.

Many thanks!
Federico


Il giorno dom 7 feb 2021 alle ore 09:00 Dave Young <dyoung@redhat.com>
ha scritto:
>
> Added Kairui in cc since he contributed that part
> On 02/05/21 at 09:15am, 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@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. */
> > --
> > 2.26.2
> >
> >
> > _______________________________________________
> > kexec mailing list
> > kexec@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/kexec
> >
> >
>

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
  2021-02-05  8:15 [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels Federico Pellegrin
  2021-02-07  8:00 ` Dave Young
@ 2021-02-23 10:32 ` Kairui Song
  2021-03-11  7:25   ` Federico Pellegrin
  2021-04-02  9:53   ` Simon Horman
  1 sibling, 2 replies; 6+ messages in thread
From: Kairui Song @ 2021-02-23 10:32 UTC (permalink / raw)
  To: Federico Pellegrin, kexec

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@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@redhat.com>


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
  2021-02-23 10:32 ` Kairui Song
@ 2021-03-11  7:25   ` Federico Pellegrin
  2021-04-02  9:53   ` Simon Horman
  1 sibling, 0 replies; 6+ messages in thread
From: Federico Pellegrin @ 2021-03-11  7:25 UTC (permalink / raw)
  To: Kairui Song; +Cc: kexec

Hello,
Just pinging on this... not sure if I need to do something else to get
it merged, please just let me know.

Thanks,
Federico

Il giorno mar 23 feb 2021 alle ore 11:32 Kairui Song
<kasong@redhat.com> ha scritto:
>
> 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@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@redhat.com>
>

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels
  2021-02-23 10:32 ` Kairui Song
  2021-03-11  7:25   ` Federico Pellegrin
@ 2021-04-02  9:53   ` Simon Horman
  1 sibling, 0 replies; 6+ messages in thread
From: Simon Horman @ 2021-04-02  9:53 UTC (permalink / raw)
  To: Kairui Song; +Cc: Federico Pellegrin, kexec

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@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@redhat.com>

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-02  9:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05  8:15 [PATCH 1/1] kexec-tools: fix build on pre 4.4 kernels Federico Pellegrin
2021-02-07  8:00 ` Dave Young
2021-02-19  4:29   ` Federico Pellegrin
2021-02-23 10:32 ` Kairui Song
2021-03-11  7:25   ` Federico Pellegrin
2021-04-02  9:53   ` Simon Horman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.