From nobody Sun Jul 21 13:14:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRkR35MtPz5RV2f; Sun, 21 Jul 2024 13:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRkR32Xynz4S7v; Sun, 21 Jul 2024 13:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41ueWV+nd+58uDex5iY4JxpsqFjer/zkI492fQkxBZc=; b=Z/zxPPlF6E4xM60CzPWtS+7uMuJ2vGjDqy+Fw8ZM5NxWEUn11qzbkAA+DeM22SFIO9qJ01 aej4OusV7byx0a7pbeiFweLDeIajXXPp+4xDCSZuJAcac5gFMplgr2V3i7ZrYljk33/mTx 4IZymFyoetSKhjXQy0uEK2i41FUF2FSKV8D43N/8YuZ+7g8Q++lNGEZCLvh9gevUxX1c57 nwil31WsdQH/zFaBZlEXo8yqv+AaoYji/+mQUEcGsc1gR8lPgZAonVghjOQZAtbYM0QtN1 ptg665i53s6VgPsT4tF3xsLm8+VqOUWMHM7Pnkr7rMikwhq+FYpni9O8qBHNfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721567695; a=rsa-sha256; cv=none; b=OjKbYq3p8xns7OomCXPJ8zuRgNTI7wbTtmSC2ZY2/gdnf6mpaSDZM3VZ+82giulv3ImLwk XSHslk38RYticUP+P18Wf48lfjUmUUX03QUWMs3dobuvJuSZkqj+WOinA5dq55r6k5ho7Z 4l9a6h6L6TGO7N3R5ebLT/1hUmFMndjslKsgG3K8zJ71ONaYt+GKdg0oJ/z90yPNuPVBhz nzD11tmzU47U7zZ2+zhFW+sQWhLr01Nnh5lwhaoEhrS4ibMJUU90S6g0A/BapdOMP+3aur fH3cKkP5yi1XmcyU2JC9RUFfuIVCQKtxohiSX5r6kdup7MucFagfHvTyKMZ/Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41ueWV+nd+58uDex5iY4JxpsqFjer/zkI492fQkxBZc=; b=BOCG+B0s8ODCgafGD07c7I/RPqFXMgGH35Z9Cv0risNzrKheykgesAJO1zd0ElrR93RbE8 0A8YHQQxKK3IsNj6dxjdp7kO+R8AcDq7+FW0qtCrdPk+33IckuT403kvecNOth9eYOq7ZS aPIJ8geGtvWDBHJoTfhrgv+HvSkCz+3ktuZKDcoUqI4BGsEXq4x9WNqFFHP/s/RWYhKRjM CUCa9wHYjQyDfk7eqH92Zwq/ZY1/npAKZIGy6XzjQVQgeuYlQCIe5uBuxVbbT9dL9NsXQB 3RacVfib1KrfImSQeKtJTm5ZBisiH7dPJAQwz4i8hxOMaOJ5rDSxl45X/7LGlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRkR31tC2z12Bk; Sun, 21 Jul 2024 13:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LDEtN7023309; Sun, 21 Jul 2024 13:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LDEtsT023306; Sun, 21 Jul 2024 13:14:55 GMT (envelope-from git) Date: Sun, 21 Jul 2024 13:14:55 GMT Message-Id: <202407211314.46LDEtsT023306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1fe7cd024342 - main - LinuxKPI: Remove owner argument from class_create function on KBI layer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fe7cd02434257692100c484cd345566c9dba528 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1fe7cd02434257692100c484cd345566c9dba528 commit 1fe7cd02434257692100c484cd345566c9dba528 Author: Vladimir Kondratyev AuthorDate: 2024-07-21 13:09:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-07-21 13:09:58 +0000 LinuxKPI: Remove owner argument from class_create function on KBI layer To chase Linux 6.4 Sponsored by: Serenity Cyber Security, LLC Differential Revision: https://reviews.freebsd.org/D45849 --- sys/compat/linuxkpi/common/include/linux/device.h | 7 ++++--- sys/compat/linuxkpi/common/src/linux_compat.c | 3 +-- sys/ofed/drivers/infiniband/core/ib_cm.c | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 912be8fbae8b..f56a39e904c8 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -57,7 +57,6 @@ struct device; struct class { const char *name; - struct module *owner; struct kobject kobj; devclass_t bsdclass; const struct dev_pm_ops *pm; @@ -342,9 +341,11 @@ put_device(struct device *dev) kobject_put(&dev->kobj); } -struct class *class_create(struct module *owner, const char *name); +struct class *lkpi_class_create(const char *name); #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60400 -#define class_create(name) class_create(NULL, name) +#define class_create(name) lkpi_class_create(name) +#else +#define class_create(owner, name) lkpi_class_create(name) #endif static inline int diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index ec4e59f66e7f..9962154cffd9 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -342,13 +342,12 @@ error: } struct class * -class_create(struct module *owner, const char *name) +lkpi_class_create(const char *name) { struct class *class; int error; class = kzalloc(sizeof(*class), M_WAITOK); - class->owner = owner; class->name = name; class->class_release = linux_class_kfree; error = class_register(class); diff --git a/sys/ofed/drivers/infiniband/core/ib_cm.c b/sys/ofed/drivers/infiniband/core/ib_cm.c index 7ace287b1c88..046f10e085c7 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cm.c +++ b/sys/ofed/drivers/infiniband/core/ib_cm.c @@ -4008,7 +4008,6 @@ static char *cm_devnode(struct device *dev, umode_t *mode) } struct class cm_class = { - .owner = THIS_MODULE, .name = "infiniband_cm", .devnode = cm_devnode, };