| Message ID | 20211011080006.31081-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/r128: fix build for UML | expand |
On 10/11/21 1:00 AM, Randy Dunlap wrote: > Fix a build error on CONFIG_UML, which does not support (provide) > wbinvd(). UML can use the generic mb() instead. > > ../drivers/gpu/drm/r128/ati_pcigart.c: In function ‘drm_ati_pcigart_init’: > ../drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function ‘wbinvd’ [-Werror=implicit-function-declaration] > wbinvd(); > ^~~~~~ > > Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: dri-devel@lists.freedesktop.org > Cc: Jeff Dike <jdike@addtoit.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Cc: linux-um@lists.infradead.org > Cc: Sam Ravnborg <sam@ravnborg.org> > --- > v2: update Fixes: tag (Johannes) > Use simple CONFIG_X86 instead of a more complicated expression. (Sam) > Oops, apparently I can't count and this is v3... :( > drivers/gpu/drm/r128/ati_pcigart.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- linux-next-20211007.orig/drivers/gpu/drm/r128/ati_pcigart.c > +++ linux-next-20211007/drivers/gpu/drm/r128/ati_pcigart.c > @@ -215,7 +215,7 @@ int drm_ati_pcigart_init(struct drm_devi > } > ret = 0; > > -#if defined(__i386__) || defined(__x86_64__) > +#ifdef CONFIG_X86 > wbinvd(); > #else > mb(); >
On Mon, Oct 11, 2021 at 01:00:06AM -0700, Randy Dunlap wrote: > Fix a build error on CONFIG_UML, which does not support (provide) > wbinvd(). UML can use the generic mb() instead. > > ../drivers/gpu/drm/r128/ati_pcigart.c: In function ‘drm_ati_pcigart_init’: > ../drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function ‘wbinvd’ [-Werror=implicit-function-declaration] > wbinvd(); > ^~~~~~ > > Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: dri-devel@lists.freedesktop.org > Cc: Jeff Dike <jdike@addtoit.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Cc: linux-um@lists.infradead.org > Cc: Sam Ravnborg <sam@ravnborg.org> Applied to drm-misc-fixes. I was not sure if this was urgent enough for fixes but since it fixes the UM build I ended up fast tracking it to master. Sam > --- > v2: update Fixes: tag (Johannes) > Use simple CONFIG_X86 instead of a more complicated expression. (Sam) > > drivers/gpu/drm/r128/ati_pcigart.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- linux-next-20211007.orig/drivers/gpu/drm/r128/ati_pcigart.c > +++ linux-next-20211007/drivers/gpu/drm/r128/ati_pcigart.c > @@ -215,7 +215,7 @@ int drm_ati_pcigart_init(struct drm_devi > } > ret = 0; > > -#if defined(__i386__) || defined(__x86_64__) > +#ifdef CONFIG_X86 > wbinvd(); > #else > mb();
--- linux-next-20211007.orig/drivers/gpu/drm/r128/ati_pcigart.c +++ linux-next-20211007/drivers/gpu/drm/r128/ati_pcigart.c @@ -215,7 +215,7 @@ int drm_ati_pcigart_init(struct drm_devi } ret = 0; -#if defined(__i386__) || defined(__x86_64__) +#ifdef CONFIG_X86 wbinvd(); #else mb();
Fix a build error on CONFIG_UML, which does not support (provide) wbinvd(). UML can use the generic mb() instead. ../drivers/gpu/drm/r128/ati_pcigart.c: In function ‘drm_ati_pcigart_init’: ../drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function ‘wbinvd’ [-Werror=implicit-function-declaration] wbinvd(); ^~~~~~ Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: linux-um@lists.infradead.org Cc: Sam Ravnborg <sam@ravnborg.org> --- v2: update Fixes: tag (Johannes) Use simple CONFIG_X86 instead of a more complicated expression. (Sam) drivers/gpu/drm/r128/ati_pcigart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)