linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] fbdev: uvesafb: don't build on UML
@ 2022-11-30 21:55 Randy Dunlap
  2022-12-01  7:57 ` Helge Deller
  0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2022-11-30 21:55 UTC (permalink / raw)
  To: linux-kernel
  Cc: Randy Dunlap, Johannes Berg, Richard Weinberger, linux-um,
	Daniel Vetter, Helge Deller, linux-fbdev, dri-devel,
	Michal Januszewski

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(+)

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

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

* Re: [PATCH 2/2] fbdev: uvesafb: don't build on UML
  2022-11-30 21:55 [PATCH 2/2] fbdev: uvesafb: don't build on UML Randy Dunlap
@ 2022-12-01  7:57 ` Helge Deller
  0 siblings, 0 replies; 2+ messages in thread
From: Helge Deller @ 2022-12-01  7:57 UTC (permalink / raw)
  To: Randy Dunlap, linux-kernel
  Cc: Johannes Berg, Richard Weinberger, linux-um, Daniel Vetter,
	linux-fbdev, dri-devel, Michal Januszewski

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


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

end of thread, other threads:[~2022-12-01  7:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-30 21:55 [PATCH 2/2] fbdev: uvesafb: don't build on UML Randy Dunlap
2022-12-01  7:57 ` Helge Deller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).