From patchwork Mon Feb 27 09:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asahi Lina X-Patchwork-Id: 61883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2317267wrd; Mon, 27 Feb 2023 01:24:04 -0800 (PST) X-Google-Smtp-Source: AK7set8kfbtEdNiYg2Nvgy1Aj261uJVOVEFWcwz0qpQ684/lI+AMt/A6hzPHDASSQKCVCMKqAHk/ X-Received: by 2002:a05:6a20:9383:b0:c7:5cd8:f851 with SMTP id x3-20020a056a20938300b000c75cd8f851mr26049281pzh.51.1677489843651; Mon, 27 Feb 2023 01:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677489843; cv=none; d=google.com; s=arc-20160816; b=y4yGqmq42UN+8XyAppdmR7OhEqdQ8I9TAriWhn4tiQvxeWiYlEE5DY42JCzDpJZzf8 4sxjAT5LtmUuhcmGK3g7EbQmp/74YnjKUkeAPwodHTo7tJO0graDwB0v/Lgg6r2YY1QN 26i5XQlfl1HcepqezrnEtTZUxLrRlRS13c/evcMC3ja0ADZgewQRJGm1+f9PsuVQLpye v18fAI+XkCrpe5rD7AH/J0+a0i7b4rvOp/E0BeiGyvnNap9nNFcK1wVonhFPHh7Oh8+w xNWL4ujI+HZf5DfqlN2VI7ZNVgHkmRArbbi6MEJewXgDs3z4de9Nwl74YZIAMADTLflW MekA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=3f6zWabxQekneLBHut4yaX5/b3I2DMPWdy7PYi+S0H8=; b=fcylrODL000I9MAo4x1CzFoNcezkOknIdmiAc2p451g2uDr+hD9H6JeTq6bJNO10Vp HgieZz9i4g+OMXzAZTOHmepmBtMuj6bGVs9PJYe3DAdPvHGXZnIEoZOHp7eRdXpOWh3Q TM9liMJzLXNj0fqA7UmWViGmIYumTTwHkk/kL+sXW+sGULlY7JFp57oNtjKHJgvRyd8q vBUik72e8bK6Is0z2n3WFCjccaNNOVYtxpOLsxkeZSfmop2kVx/NtPyOD11ecIXoZ4qx QmoPLLspm3IxwhKBjupBBNJIYDhd6DVPIBgs65qq9LsEzWOYHH6U00e5h+i3FnlZvmi7 Wc7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@asahilina.net header.s=default header.b=w0xGWlmE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=asahilina.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x21-20020a63fe55000000b004fbacd1a872si5970456pgj.853.2023.02.27.01.23.50; Mon, 27 Feb 2023 01:24:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@asahilina.net header.s=default header.b=w0xGWlmE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=asahilina.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229676AbjB0JMq (ORCPT + 99 others); Mon, 27 Feb 2023 04:12:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjB0JM3 (ORCPT ); Mon, 27 Feb 2023 04:12:29 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C7D32007E for ; Mon, 27 Feb 2023 01:04:46 -0800 (PST) Received: from [127.0.0.1] (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) (No client certificate requested) (Authenticated sender: linasend@asahilina.net) by mail.marcansoft.com (Postfix) with ESMTPSA id 7AB1A41A42; Mon, 27 Feb 2023 09:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=asahilina.net; s=default; t=1677488684; bh=6xesS6Ljou66pP6PWhd2jHCz/oRFGXqhqdZJF8Pqu1Q=; h=From:Date:Subject:To:Cc; b=w0xGWlmEV7OPrLJlrOKrWGYFhD0k444BX2duDEDHbSEjUVYQ8XOreZfl64+/x8zQH e0SpnCTY8SBVUD6RjDQFzlzITqdmLrgOTi5R4PYHq27qS1qVzHF6POb0EGCpY+FEck /fvehgHqgXkBypCtRZPfCnKbAZFb+lYphz5w0Cr9/xQM+Fx1yUPwqF52hzbfASQ9Nz sM2lNUGp06NxG/Dkiz+8J1R9w/tL4E/gq10DxQdXjDd7d0U1xOM64HZOQWt1OhBoW1 cTpQVi4VTNrrN2NStOb1EM40dppWWWda7zPmoQdlchezWWwuTrV/cMGOip10w5oCO8 AV6GKmQA+HN4Q== From: Asahi Lina Date: Mon, 27 Feb 2023 18:04:21 +0900 Subject: [PATCH] drm/shmem-helper: Revert accidental non-GPL export MIME-Version: 1.0 Message-Id: <20230227-shmem-export-fix-v1-1-8880b2c25e81@asahilina.net> X-B4-Tracking: v=1; b=H4sIABRy/GMC/x2NQQqDMBBFryKz7kASlZZepXQR9dvMIlFmShHEu ze6fI//+DsZVGD0bHZS/MRkKRX8raExxfIBy1SZggutC+HOljIyY1sX/fIsGz/6eYJve+9dRzU booEHjWVMZ5ijlFOvirq+nl7v4/gDwpvuV3kAAAA= To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Javier Martinez Canillas Cc: =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Rob Herring , Alyssa Rosenzweig , Dmitry Osipenko , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Asahi Lina X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677488681; l=1150; i=lina@asahilina.net; s=20230221; h=from:subject:message-id; bh=6xesS6Ljou66pP6PWhd2jHCz/oRFGXqhqdZJF8Pqu1Q=; b=HkugH8SjAQj8+MQlqS+NqL2h3dR12a7j47b1UtiTRuIfvIf4NwxK1ZD3DSg5iscrgwpF+jHpt GEJerGjGAoMB/Bnjfige8yg8ZPnbbwJq+F7DHst6hYKtD7Ra+vhgPIC X-Developer-Key: i=lina@asahilina.net; a=ed25519; pk=Qn8jZuOtR1m5GaiDfTrAoQ4NE1XoYVZ/wmt5YtXWFC4= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758975590167216356?= X-GMAIL-MSGID: =?utf-8?q?1758975590167216356?= The referenced commit added a wrapper for drm_gem_shmem_get_pages_sgt(), but in the process it accidentally changed the export type from GPL to non-GPL. Switch it back to GPL. Reported-by: Dmitry Osipenko Fixes: ddddedaa0db9 ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()") Signed-off-by: Asahi Lina Reviewed-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: f3a2439f20d918930cc4ae8f76fe1c1afd26958f change-id: 20230227-shmem-export-fix-85fde1351104 Thank you, ~~ Lina diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 7e5c6a8d0212..75185a960fc4 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) return sgt; } -EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt); +EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt); /** * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from