From patchwork Mon Dec 9 01:17:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13898743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8677CE7717F for ; Mon, 9 Dec 2024 01:17:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8CB810E276; Mon, 9 Dec 2024 01:17:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="i1UwMysJ"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id C676410E0B9; Mon, 9 Dec 2024 01:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1733707036; bh=t+DmoviSdAlTAk3abSj0RVB34XICUcoxmmWptoeLCtM=; h=Date:From:To:Cc:Subject:From; b=i1UwMysJ1ZO+TD6/r/L/NuH6jt2pIFn/AEYRufyRUxUUSG9XNjWRZbrDr/17Gv8n8 t4GbF1iqZzcKPKr+Y8pHVFtZAI336VhJhZwe+t7Vai5JUOW+rbnRiO4VE9akZ9a8DD 7WoLcmFfKMlzHTSDlv1m7KSIf5oKzPB0bAJm97mDbfqBv4cJZ8qr6+GQA/ShNL1SBg 8SF1uT4bNFkVVDcBY43BwUqSfOp6KqwNbcVBKHl+Hs3bP05YOyDTnta42yW05eKAkl tw3hdinSvuWLH5khcwbwTYpgyI4m6fEpW+wAO6K/gBdY2aDKbrtO2kZxw/dawa1Aei kcROYCcYV1kPw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Y63qt32kcz4wj1; Mon, 9 Dec 2024 12:17:14 +1100 (AEDT) Date: Mon, 9 Dec 2024 12:17:17 +1100 From: Stephen Rothwell To: Simona Vetter Cc: Peter Zijlstra , Dmitry Osipenko , Vivek Kasireddy , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20241209121717.2abe8026@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 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 --- drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)