From patchwork Fri May 9 12:54:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889833 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32C1D29209E; Fri, 9 May 2025 12:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; cv=none; b=Xx4wu4edqfYegjNNt9QPk1+fUKZBNyp72mf14zTPQ6aMRWgPQcxJ3pOKlD7CrXU99y8vAqFX8jFqi7dkIKSDlNYmdqQq7FbuDy5XwP8fkLJjw980/CrixYY2yJLeYX94zS2Jy6PXbupaS7OqoKGsa3or/mutKvTtOOOxklVBKnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M1zu0U0Tqp6qcxdCml1uoKLuyNnJmum508vYG9jhZwUQCfRnNTN5uBGfTwo5dkUUoMMyVJHqhugto+kuRCA3tnh+6V27S80AUKnf1bfCjNh4szMRk4y8iVPN1UAUa6pRQb32dnwIHRw4MEINIyvN88mmPU3bUUKsNsbBiyj7sRg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jbEENuG+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jbEENuG+" Received: by smtp.kernel.org (Postfix) with ESMTPS id 03C27C4AF0D; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795307; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jbEENuG+3tRAzgzvib7NK1u8He3UFwjseJ2zGfY5OJXb14oKKhGTqT+Tm+inity0J gHb7W5nOy5wmuKx1fmSTgtyhPbh2li11pX386h7283i5RaTpnzhRa4R0jGdGGevM1o RbonCeAJ3py5cY1zYtP6SRMdtX3KY5MPJMkTZi/+BJCa7TXr7KylFPMy+k/HR200YN f/ReEtZo/Ns37bbMV1FQ5kJaiPUoc1+Rm1frjUREmDn0uwu3K7p24OYLLNApWN33kC WJSNQ8lHD5cwna7ih+lMlu5TnnmhZj5EVyfzm3hbnoiCde5HEBRUXNr9N5gLNyY+DJ NrmvCMFaEDT5w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7F1EC3ABC3; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:09 +0200 Subject: [PATCH 05/12] parisc/power: Move soft-power into power.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-5-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2508; i=joel.granados@kernel.org; h=from:subject:message-id; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yOtnQB/bJFt/7J5h4oiYG8sIaqpsH1ED v9nLDttnyWwn4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsjAAoJELqXzVK3 lkFPFaAL/Ar0qxWKRezFimngFzcnCsml3mGCyVaueqDYkhIcXd9TAx4Vy2cbd8a6EyROmFFeF0r rVCXwDYsGMaqo2dGI1CisaSk43tUbGRUrAjy1d0hnUNKg2akUhqGpv0z5/KHp0bNdVtIEykxQwp RR4bF+33DGLOfOKwBq3XsCheE9gvVSvQStge4+MR/jNHTMy0ZW7CGAhCucj9EH8bpVa3GzHdYNV uS/c89PQ5kSKvJBi3Y252xpjBbYCDbEkn0tojDZJ7Ep0hIsQT9Mlph3bYXGt0hhgH9byKOQo/1j 8ooJpt5ydx76RfZ17U3pO1p/4eFA6wHWm6zYrMt6VbprDCuSg7BxIUfq7cWUA36mc06me/305ZO X73egkYLEiSbevWt4UoUxMOv/VavPwPfdrOBmByYPaB90vqcFqCUZUiY7O4kN0gV4yRARoL00K4 NT03pMxoTZZpPF7Fh6dp0xpLzvZ2r5JvfKtIJnOR1h8SEFSXHPnid/uoqmvqLCUI42yfnmgd/76 jc= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move the soft-power ctl table into parisc/power.c. As a consequence the pwrsw_enabled var is made static. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kernel/sysctl.c. Signed-off-by: Joel Granados --- drivers/parisc/power.c | 20 +++++++++++++++++++- include/linux/sysctl.h | 1 - kernel/sysctl.c | 9 --------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index 7a6a3e7f2825be5191e024e6c7af1cd688219b75..9d6c7bf72e2958348e263a7e82025038694ebfbc 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -83,7 +83,25 @@ static struct task_struct *power_task; #define SYSCTL_FILENAME "sys/kernel/power" /* soft power switch enabled/disabled */ -int pwrsw_enabled __read_mostly = 1; +static int pwrsw_enabled __read_mostly = 1; + +static const struct ctl_table power_sysctl_table[] = { + { + .procname = "soft-power", + .data = &pwrsw_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_power_sysctl(void) +{ + register_sysctl_init("kernel", power_sysctl_table); + return 0; +} + +arch_initcall(init_power_sysctl); /* main kernel thread worker. It polls the button state */ static int kpowerswd(void *param) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 40a6ac6c9713f3504c4dfcb4fcc77dff7dce8ca6..ae762eabb7c9715e973356cadafbaaea3f20c7e9 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -242,7 +242,6 @@ int do_proc_douintvec(const struct ctl_table *table, int write, int write, void *data), void *data); -extern int pwrsw_enabled; extern int unaligned_enabled; extern int unaligned_dump_stack; extern int no_unaligned_warning; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index adc2d3ea127841d87b7073ed81d6121c9a60e59a..718140251972b797f5aa5a056de40e8856805eed 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1594,15 +1594,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, }, #endif -#ifdef CONFIG_PARISC - { - .procname = "soft-power", - .data = &pwrsw_enabled, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW { .procname = "unaligned-trap",