| Message ID | 20241209121717.2abe8026@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: build failure after merge of the drm-misc tree | expand |
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 688810d1b611..b3664c12843d 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -27,7 +27,7 @@ #include "virtgpu_drv.h" -MODULE_IMPORT_NS(DMA_BUF); +MODULE_IMPORT_NS("DMA_BUF"); static int virtgpu_virtio_get_uuid(struct dma_buf *buf, uuid_t *uuid)
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/module.h:22, from include/linux/device/driver.h:21, from include/linux/device.h:32, from include/linux/dma-mapping.h:5, from include/linux/dma-buf.h:21, from include/linux/virtio_dma_buf.h:11, from drivers/gpu/drm/virtio/virtgpu_prime.c:26: drivers/gpu/drm/virtio/virtgpu_prime.c:30:18: error: expected ',' or ';' before 'DMA_BUF' 30 | MODULE_IMPORT_NS(DMA_BUF); | ^~~~~~~ include/linux/moduleparam.h:26:61: note: in definition of macro '__MODULE_INFO' 26 | = __MODULE_INFO_PREFIX __stringify(tag) "=" info | ^~~~ include/linux/module.h:299:33: note: in expansion of macro 'MODULE_INFO' 299 | #define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, ns) | ^~~~~~~~~~~ drivers/gpu/drm/virtio/virtgpu_prime.c:30:1: note: in expansion of macro 'MODULE_IMPORT_NS' 30 | MODULE_IMPORT_NS(DMA_BUF); | ^~~~~~~~~~~~~~~~ Caused by commit 25c3fd1183c0 ("drm/virtio: Add a helper to map and note the dma addrs and lengths") Interacting with commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal") from Linus' tree. I have applied the following merge fix patch for today. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 9 Dec 2024 12:08:24 +1100 Subject: [PATCH] fix up for "drm/virtio: Add a helper to map and note the dma addrs and lengths" interacting with commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal") from Linus' tree. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)