From patchwork Sun May 8 22:38:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucian Adrian Grijincu X-Patchwork-Id: 94689 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 54A1EB700C for ; Mon, 9 May 2011 09:02:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932345Ab1EHW77 (ORCPT ); Sun, 8 May 2011 18:59:59 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:53450 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932299Ab1EHWlE (ORCPT ); Sun, 8 May 2011 18:41:04 -0400 Received: by wwa36 with SMTP id 36so5167017wwa.1 for ; Sun, 08 May 2011 15:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=fSoUvFeJKcsqBroGbUpsJ8w9U/6XPJPjJPeVWYnwkns=; b=aLXsusQdFMwymbIRduzrD7hKWbWyRUJXzk5CdG9UxUpc+vZT+lcoFp6o/lswoXrPeu LDbSmh71X4y6027lfOGeHAHtGDv5nh18oqLuQ0jvIX2Krw6Fe9JgFH7WQmFfocewsu2U hDQcqbWRO/coGe7dFBNaiaLVb2H0HNC3Lfis0= 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=HLXlf5pVbkbIHAI+7JmEs1IOdCLOaGMGlpqatycCkUFfa2tFIuGjas05MCDpfIYQiS RoiWNKpwDwwNJLcQx529YMyBXnANab+SkLwXN/VjiLuCZh8bZYSLeL60V0uHVNunmkg+ kdjWMPBmga9AANBYvbK/zc8oWPTPWORvetOFE= Received: by 10.227.199.21 with SMTP id eq21mr1769904wbb.101.1304894463605; Sun, 08 May 2011 15:41:03 -0700 (PDT) Received: from localhost.localdomain (aut75-5-82-239-182-128.fbx.proxad.net [82.239.182.128]) by mx.google.com with ESMTPS id ed10sm3390518wbb.66.2011.05.08.15.41.02 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2011 15:41:02 -0700 (PDT) From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Lucian Adrian Grijincu Subject: [v2 032/115] sysctl: remove .child from kernel/ (utsname) Date: Mon, 9 May 2011 00:38:44 +0200 Message-Id: <1304894407-32201-33-git-send-email-lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.134.g1c08b In-Reply-To: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> References: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Lucian Adrian Grijincu --- kernel/utsname_sysctl.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c index a2cd77e..7606026 100644 --- a/kernel/utsname_sysctl.c +++ b/kernel/utsname_sysctl.c @@ -57,7 +57,7 @@ static int proc_do_uts_string(ctl_table *table, int write, #define proc_do_uts_string NULL #endif -static struct ctl_table uts_kern_table[] = { +static struct ctl_table uts_table[] = { { .procname = "ostype", .data = init_uts_ns.name.sysname, @@ -96,18 +96,14 @@ static struct ctl_table uts_kern_table[] = { {} }; -static struct ctl_table uts_root_table[] = { - { - .procname = "kernel", - .mode = 0555, - .child = uts_kern_table, - }, - {} +static const __initdata struct ctl_path uts_path[] = { + { .procname = "kernel" }, + { }, }; static int __init utsname_sysctl_init(void) { - register_sysctl_table(uts_root_table); + register_sysctl_paths(uts_path, uts_table); return 0; }