From patchwork Thu Jun 17 20:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian May X-Patchwork-Id: 1493961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5Ynh3Y1qz9sSn; Fri, 18 Jun 2021 06:39:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ltynU-0007st-F6; Thu, 17 Jun 2021 20:39:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ltynP-0007py-PA for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2021 20:39:27 +0000 Received: from mail-ed1-f71.google.com ([209.85.208.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ltynP-0004hA-Hy for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2021 20:39:27 +0000 Received: by mail-ed1-f71.google.com with SMTP id ch5-20020a0564021bc5b029039389929f28so2281053edb.16 for ; Thu, 17 Jun 2021 13:39:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D0CeYcw7B065E3WwVznJ5IDAh60/Uztm0vOB6GaxP40=; b=XY9uUwKmU3TzqZ4NHe6lXRxHp2JGiDoePLoY3dUvFkuTcJ6Fiel1COZopa9ubnA2Ic /ilzDVOphfWYGdltvLEYrMqml+EdE7xMdBaxnktjA2I+v2Ho56O4E41RGH65tayzkeIG pdBV6qzXlB5o3sbWpqOBcP0BVl/yMbsAwqzE6XbnooIsFCIEUfadG2bH2clAkCjBsxx7 Wknk+yU6+YJmpTYrKEpN3hqCpefU6vypfQLshIE8lekewcGMZv+U0lgpcEc9W3/98mC3 Htrg3euplD//4OuSbFxquJsGp3t5IspHJh3p79mPmVBDOyNrw7jHQH8DivqnAn7hytkx qO5A== X-Gm-Message-State: AOAM532dPd6rSjyICGVqNAfSWsgkJFPBBk+j0f8WHn5bMe3aSBYWbBtO GhoNapGYCGftMS+U3dPxGP1SXbnc3RTaC4w4X0piXSmktjFJNSFsK6TlYpstabgQ8lLjDUyUZku ptkbB4xEa/16dCAE0sVYy9l+E8urXQys6oX1XZAV5Hw== X-Received: by 2002:a17:906:9713:: with SMTP id k19mr7380450ejx.516.1623962367195; Thu, 17 Jun 2021 13:39:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK5n2/VcM/I2idqBGSJqDrWDiv0NvsJoIO5XyE7+4FbpjUyCU5dIvxOTP9JEORf919io046A== X-Received: by 2002:a17:906:9713:: with SMTP id k19mr7380436ejx.516.1623962367010; Thu, 17 Jun 2021 13:39:27 -0700 (PDT) Received: from uws.buildd ([2001:67c:1562:8007::aac:44bb]) by smtp.gmail.com with ESMTPSA id lu21sm50623ejb.31.2021.06.17.13.39.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 13:39:26 -0700 (PDT) From: Ian May To: kernel-team@lists.ubuntu.com Subject: [SRU][G][PATCH 3/8] UBUNTU: SAUCE: Revert "modules: rename the licence field in struct symsearch to license" Date: Thu, 17 Jun 2021 15:39:12 -0500 Message-Id: <20210617203917.1583344-4-ian.may@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210617203917.1583344-1-ian.may@canonical.com> References: <20210617203917.1583344-1-ian.may@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1932065 This reverts commit e63bce648bdcd094a42da9bf45a89a68403a0636. Upstream introduced 'module' patches that removed exported symbols that might cause potential disruption and breakage for customers. Reverting as SAUCE patches to prevent regressions. Signed-off-by: Ian May --- include/linux/module.h | 2 +- kernel/module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index be04ba2f881d..b79219eed83c 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -586,7 +586,7 @@ struct symsearch { NOT_GPL_ONLY, GPL_ONLY, WILL_BE_GPL_ONLY, - } license; + } licence; bool unused; }; diff --git a/kernel/module.c b/kernel/module.c index 03e0170a0d65..9ebcdab96b43 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -505,9 +505,9 @@ static bool check_exported_symbol(const struct symsearch *syms, struct find_symbol_arg *fsa = data; if (!fsa->gplok) { - if (syms->license == GPL_ONLY) + if (syms->licence == GPL_ONLY) return false; - if (syms->license == WILL_BE_GPL_ONLY && fsa->warn) { + if (syms->licence == WILL_BE_GPL_ONLY && fsa->warn) { pr_warn("Symbol %s is being used by a non-GPL module, " "which will not be allowed in the future\n", fsa->name);