From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759698Ab1EABrf (ORCPT ); Sat, 30 Apr 2011 21:47:35 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:52916 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756515Ab1EABhr (ORCPT ); Sat, 30 Apr 2011 21:37:47 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=F+qpjf0wRkPQ1ps5vktmRDVRa42OqJzjRFzPRz4iR8+mWYAESrNGQM7iUqHgmxMB4Z zKDSbPT3+g0S/fYgQ+JlbSNldTXQh+1VpUwhxK7TaNQYs323jJRrpCw4pPWfRHMmz1vW VoJDY2M5EWOelDgcmpMtFn7NNgHdfSIBUHn1A= From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: Lucian Adrian Grijincu Subject: [PATCH 43/69] sysctl: remove .child from kernel/perfmon/ (ia64) Date: Sun, 1 May 2011 03:36:13 +0200 Message-Id: <1304213799-10257-44-git-send-email-lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.134.g1c08b In-Reply-To: <1304213799-10257-1-git-send-email-lucian.grijincu@gmail.com> References: <1304213799-10257-1-git-send-email-lucian.grijincu@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Lucian Adrian Grijincu --- arch/ia64/kernel/perfmon.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 89accc6..96743dd 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -552,22 +552,13 @@ static ctl_table pfm_ctl_table[]={ }, {} }; -static ctl_table pfm_sysctl_dir[] = { - { - .procname = "perfmon", - .mode = 0555, - .child = pfm_ctl_table, - }, - {} -}; -static ctl_table pfm_sysctl_root[] = { - { - .procname = "kernel", - .mode = 0555, - .child = pfm_sysctl_dir, - }, - {} + +static const __initdata struct ctl_path pfm_path[] = { + { .procname = "kernel" }, + { .procname = "perfmon" }, + { } }; + static struct ctl_table_header *pfm_sysctl_header; static int pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs); @@ -6687,7 +6678,7 @@ pfm_init(void) /* * create /proc/sys/kernel/perfmon (for debugging purposes) */ - pfm_sysctl_header = register_sysctl_table(pfm_sysctl_root); + pfm_sysctl_header = register_sysctl_paths(pfm_path, pfm_ctl_table); /* * initialize all our spinlocks -- 1.7.5.134.g1c08b