From nobody Sun Feb 8 18:08:50 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15E5CC6FD1C for ; Wed, 22 Mar 2023 18:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231337AbjCVS4N (ORCPT ); Wed, 22 Mar 2023 14:56:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbjCVSzS (ORCPT ); Wed, 22 Mar 2023 14:55:18 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B2CD69CE7; Wed, 22 Mar 2023 11:54:19 -0700 (PDT) Date: Wed, 22 Mar 2023 18:54:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679511252; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GJf10FYfpAZrTDKMhvIyel8utBrLE4EWcSh0ltNPLE=; b=3KLRq8GyCfVV6dcFj+GSN5SSNHeVZRmbr6smykZRmpRP1ofDqp8+A8IjTTOhoxgUa1WDdl mPBwK95aKa7TSrLQEqBWjDvwtRt63JOpJT1W8fSZkowYan721y8Ae9+rpoiRtvvii9TvXj 1xnfAZQm7XELhIgXjxswonNpnignqJe3QP/YDZr4IK/J6tHr2JXY8RAdhZto/ZRcU0ml+X skLOQwadSgd17LlNF4WOGAhV9dCV32RimB6Oo2aZYjyXIhgJJ/dqvmlk+sg59jUzpKxQOI iQgUmj3xu3E22MeX/PrMlaJcqEvZ5mzdVW87mTz2QohAdGQN1rzbRaGHg16+Kw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679511252; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GJf10FYfpAZrTDKMhvIyel8utBrLE4EWcSh0ltNPLE=; b=ywG0YpRMGv9zZsD7/eflE8k7V58LjgBxKOBOECq13kztkPJf8fFtCh7Y0QMHNSw5oxWu6Z TzX1DkOZv7NrlKBw== From: "tip-bot2 for Luis Chamberlain" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86: Simplify one-level sysctl registration for abi_table2 Cc: Luis Chamberlain , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167951125196.5837.18123258541770428595.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 3f6cc47f5eb40d96ce8cf443282a2c29fd629a76 Gitweb: https://git.kernel.org/tip/3f6cc47f5eb40d96ce8cf443282a2c29f= d629a76 Author: Luis Chamberlain AuthorDate: Fri, 10 Mar 2023 15:32:47 -08:00 Committer: Dave Hansen CommitterDate: Wed, 22 Mar 2023 11:47:21 -07:00 x86: Simplify one-level sysctl registration for abi_table2 There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20230310233248.3965389-2-mcgrof%40kernel.= org --- arch/x86/entry/vdso/vdso32-setup.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso3= 2-setup.c index 3b300a7..f3b3cac 100644 --- a/arch/x86/entry/vdso/vdso32-setup.c +++ b/arch/x86/entry/vdso/vdso32-setup.c @@ -70,18 +70,9 @@ static struct ctl_table abi_table2[] =3D { {} }; =20 -static struct ctl_table abi_root_table2[] =3D { - { - .procname =3D "abi", - .mode =3D 0555, - .child =3D abi_table2 - }, - {} -}; - static __init int ia32_binfmt_init(void) { - register_sysctl_table(abi_root_table2); + register_sysctl("abi", abi_table2); return 0; } __initcall(ia32_binfmt_init);