From nobody Sun Dec 24 08:23:10 2023 X-Original-To: dev-commits-src-main@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 4SyYvL4ngcz54H5L; Sun, 24 Dec 2023 08:23:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyYvL2MNCz4XyW; Sun, 24 Dec 2023 08:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406190; 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=4oMkfUPgviCsNguP+e79q/oVi2bG/PRThBeMS488bDo=; b=lFYN7zhyda1iIz86SnPWv470sViGX7zeTe5uVAKRx5gQ7gAczHEFqkSaPKnoa2yWq/G6pP m3yMnJj2PjritbicH828KY+7B8Jfm5d9EaKMkVLZ0iAyf887ojsbngzmK/1ouPXHiw3I1R aVeqXjL48E54Ej3For7tjbpsd0MUBr7KFJ7ujqRjPP0crbgunlthLiB7fdACx3pCT7B/As OUFcke8kFiqoFRum+CQgLqfQxW5F8CxHXU7Cc/wolJB38rs+LCs4sQq4h13TgwOaKKGf6t /88LuJFG9R4mN6V2mat8UzlbpZzSSVWB+KlKzLGSocftAu6huNn/jHmg2ep+JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406190; a=rsa-sha256; cv=none; b=OTsA1r5vEOi9D9+HotQE/YX3fxZVt3sn3qANuaQW5opZNXpJmDARwS6XMwKTpW3AZd7NJk 8osnEWK8w0iTQarLsFZ2gqrWciAEIB31Fp2V2moNXvRPC4aWynJy8+JqVia+ymw58P/Idb dx6IilqUyG+M7qc664bFuTs/+yyeVbUUWpmfynWOyV5tKxVAAl8uZdNJI+TTzCk/DXgCap kX3GBx13n1ylf8MBW/6I5ND3RDcpHJGUe7Zi7FRpZJ6Gt4YrYF53XYc6hmu3aZprmw7foD Ge/E4k9vZO+x8aty/HdfgsiEJVNhwlQJk7iPIlZ9cRMHqT9qmKwg3xGzb2igyg== 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=1703406190; 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=4oMkfUPgviCsNguP+e79q/oVi2bG/PRThBeMS488bDo=; b=HsTLOs+rlYAX0mLMu9kRwsjgTJ/4/M166JWALjjSyao4PmtuRqM14aF/DpN71IFlrfFcvc N5yQQ5p6QOXN+FDzHC3K5K4EStP99dgiEyg8pyZ+XeQ09tN/kNCFLljXDPIdKcfgbRYoh6 LgnZN6wpDiy5noZ/HpyYfx9cg3gkdRxw8B3u3OfbEmcFuMFzzxeYCvFXbHe3KKPXyPnRrR 5aEnts+aPV2pC/F4O3WJB0YjMeQP1enZa9zgkNmHZF7okqKroaKrn4UC3S6ORVjMhksVg7 4DWqv5VBZI+c0a68Fb8nvXyMhBqiKfDckXZtwv4eIfCEqyZFesBF2gwbx/JyvA== 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 4SyYvL1RSTz5sm; Sun, 24 Dec 2023 08:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO8NAEi087221; Sun, 24 Dec 2023 08:23:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8NAIU087218; Sun, 24 Dec 2023 08:23:10 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:10 GMT Message-Id: <202312240823.3BO8NAIU087218@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: a39ed121eab1 - main - LinuxKPI: Chase for new "name" argument of register_shrinker() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a39ed121eab16bd2579422f71df7ef29b55965d1 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a39ed121eab16bd2579422f71df7ef29b55965d1 commit a39ed121eab16bd2579422f71df7ef29b55965d1 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +0000 LinuxKPI: Chase for new "name" argument of register_shrinker() Linux uses it only if SHRINKER_DEBUG config option is enabled. Ignore it. Sponsored by: Serenity Cyber Security, LLC Reviewers: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42809 --- sys/compat/linuxkpi/common/include/linux/shrinker.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/shrinker.h b/sys/compat/linuxkpi/common/include/linux/shrinker.h index eb3093f4fb19..a865241cc7cb 100644 --- a/sys/compat/linuxkpi/common/include/linux/shrinker.h +++ b/sys/compat/linuxkpi/common/include/linux/shrinker.h @@ -51,7 +51,11 @@ int linuxkpi_register_shrinker(struct shrinker *s); void linuxkpi_unregister_shrinker(struct shrinker *s); void linuxkpi_synchronize_shrinkers(void); +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60000 +#define register_shrinker(s, ...) linuxkpi_register_shrinker(s) +#else #define register_shrinker(s) linuxkpi_register_shrinker(s) +#endif #define unregister_shrinker(s) linuxkpi_unregister_shrinker(s) #define synchronize_shrinkers() linuxkpi_synchronize_shrinkers()