| Message ID | 20200821104910.3363818-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n | expand |
On 8/21/20 12:49 PM, Michael Ellerman wrote: > The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n: > > linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’: > linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’ > 276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF, > | ^~~~~~~~~~~~~~~~~~~~ > > Fix it by including btext.h whenever CONFIG_BOOTX_TEXT is enabled. > > Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Thanks for fixing this. > --- > drivers/video/fbdev/controlfb.c | 2 ++ > 1 file changed, 2 insertions(+) > > Does anyone mind if I apply this via the powerpc tree for v5.9? > > It would be nice to get the build clean. No objections from my side. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > cheers > > diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c > index 9c4f1be856ec..547abeb39f87 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -49,6 +49,8 @@ > #include <linux/cuda.h> > #ifdef CONFIG_PPC_PMAC > #include <asm/prom.h> > +#endif > +#ifdef CONFIG_BOOTX_TEXT > #include <asm/btext.h> > #endif >
On Fri, 21 Aug 2020 20:49:10 +1000, Michael Ellerman wrote: > The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n: > > linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’: > linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’ > 276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF, > | ^~~~~~~~~~~~~~~~~~~~ > > [...] Applied to powerpc/fixes. [1/1] video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n https://git.kernel.org/powerpc/c/4d618b9f3fcab84e9ec28c180de46fb2c929d096 cheers
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 9c4f1be856ec..547abeb39f87 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -49,6 +49,8 @@ #include <linux/cuda.h> #ifdef CONFIG_PPC_PMAC #include <asm/prom.h> +#endif +#ifdef CONFIG_BOOTX_TEXT #include <asm/btext.h> #endif
The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n: linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’: linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’ 276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF, | ^~~~~~~~~~~~~~~~~~~~ Fix it by including btext.h whenever CONFIG_BOOTX_TEXT is enabled. Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- drivers/video/fbdev/controlfb.c | 2 ++ 1 file changed, 2 insertions(+) Does anyone mind if I apply this via the powerpc tree for v5.9? It would be nice to get the build clean. cheers