2022-11-30 22:11:32

by Randy Dunlap

Subject: [PATCH 2/2] fbdev: uvesafb: don't build on UML

The uvesafb fbdev driver uses memory management information that is not
available on ARCH=um, so don't allow this driver to be built on UML.

Prevents these build errors:

../drivers/video/fbdev/uvesafb.c: In function ‘uvesafb_vbe_init’:
../drivers/video/fbdev/uvesafb.c:807:21: error: ‘__supported_pte_mask’ undeclared (first use in this function)
807 | if (__supported_pte_mask & _PAGE_NX) {
../drivers/video/fbdev/uvesafb.c:807:44: error: ‘_PAGE_NX’ undeclared (first use in this function)
807 | if (__supported_pte_mask & _PAGE_NX) {

Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Johannes Berg <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: [email protected]
Cc: Daniel Vetter <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Michal Januszewski <[email protected]>
---
drivers/video/fbdev/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -609,6 +609,7 @@ config FB_TGA
config FB_UVESA
tristate "Userspace VESA VGA graphics support"
depends on FB && CONNECTOR
+ depends on !UML
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT

2022-12-01 08:17:12

by Helge Deller

Subject: Re: [PATCH 2/2] fbdev: uvesafb: don't build on UML

On 11/30/22 22:55, Randy Dunlap wrote:
> The uvesafb fbdev driver uses memory management information that is not
> available on ARCH=um, so don't allow this driver to be built on UML.
>
> Prevents these build errors:
>
> ../drivers/video/fbdev/uvesafb.c: In function ‘uvesafb_vbe_init’:
> ../drivers/video/fbdev/uvesafb.c:807:21: error: ‘__supported_pte_mask’ undeclared (first use in this function)
> 807 | if (__supported_pte_mask & _PAGE_NX) {
> ../drivers/video/fbdev/uvesafb.c:807:44: error: ‘_PAGE_NX’ undeclared (first use in this function)
> 807 | if (__supported_pte_mask & _PAGE_NX) {
>
> Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Johannes Berg <[email protected]>
> Cc: Richard Weinberger <[email protected]>
> Cc: [email protected]
> Cc: Daniel Vetter <[email protected]>
> Cc: Helge Deller <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Michal Januszewski <[email protected]>


applied.
Thanks!

Helge

> ---
> drivers/video/fbdev/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
> --- a/drivers/video/fbdev/Kconfig
> +++ b/drivers/video/fbdev/Kconfig
> @@ -609,6 +609,7 @@ config FB_TGA
> config FB_UVESA
> tristate "Userspace VESA VGA graphics support"
> depends on FB && CONNECTOR
> + depends on !UML
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT