diff mbox series

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

Message ID 20221130215559.28969-1-rdunlap@infradead.org
State New
Headers
Series [1/2] fbdev: geode: don't build on UML |

Commit Message

Randy Dunlap Nov. 30, 2022, 9:55 p.m. UTC 
  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 <rdunlap@infradead.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-um@lists.infradead.org
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: Michal Januszewski <spock@gentoo.org>
---
 drivers/video/fbdev/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Helge Deller Dec. 1, 2022, 7:57 a.m. UTC | #1 
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 <rdunlap@infradead.org>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-um@lists.infradead.org
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Helge Deller <deller@gmx.de>
> Cc: linux-fbdev@vger.kernel.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: Michal Januszewski <spock@gentoo.org>


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
diff mbox series

Patch

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