From patchwork Sun May 8 22:38:19 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: 94712 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 B5972B7041 for ; Mon, 9 May 2011 09:11:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756405Ab1EHXGN (ORCPT ); Sun, 8 May 2011 19:06:13 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:47346 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755943Ab1EHWkh (ORCPT ); Sun, 8 May 2011 18:40:37 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so3497080wya.19 for ; Sun, 08 May 2011 15:40:36 -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=1S/o+veaAxmAltCFJNpmVt3IcnAoSA31fwHKZSFpmwU=; b=KlWcgx4tLuFVPiEUod0VYwLN6uaK/OYy9zPosCDoGvlwj+BEGBanYANAipS5mEfmpD nsSYPbfjtiQHdCQZgAh+moP1j7Oyhbh4HAWerdNBlo7jzocngh1+vGT3jBz1uFSn/6vw 9Jb7xvSmwEP821ThjzlFs35XegM31BeKm9ewY= 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=nkNROJQoTtqJaC5XqsF96WHf51JVctu7aNX5Y3poHQO4PKfYyBie2JzT8VpCzUTNDy F6vnS8borS9THV0797AVGmrpHmHiA/spXykFMhNSM61qdqc7lk8Xfa4M+egETsUqfynk 6rzYXi5YqxtuAXPItAYsB/EwNilvLDBeWrNwU= Received: by 10.227.204.197 with SMTP id fn5mr6309194wbb.36.1304894436509; Sun, 08 May 2011 15:40:36 -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.40.35 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2011 15:40:35 -0700 (PDT) From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Lucian Adrian Grijincu Subject: [v2 007/115] sysctl: remove .child from abi/vsyscall32 (x86) Date: Mon, 9 May 2011 00:38:19 +0200 Message-Id: <1304894407-32201-8-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 --- arch/x86/vdso/vdso32-setup.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c index 468d591..e6ef3b4 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@ -380,7 +380,7 @@ subsys_initcall(sysenter_setup); /* Register vsyscall32 into the ABI table */ #include -static ctl_table abi_table2[] = { +static ctl_table abi_table[] = { { .procname = "vsyscall32", .data = &sysctl_vsyscall32, @@ -391,18 +391,14 @@ static ctl_table abi_table2[] = { {} }; -static ctl_table abi_root_table2[] = { - { - .procname = "abi", - .mode = 0555, - .child = abi_table2 - }, - {} +static const struct ctl_path abi_root_path[] = { + { .procname = "abi" }, + { } }; static __init int ia32_binfmt_init(void) { - register_sysctl_table(abi_root_table2); + register_sysctl_paths(abi_root_path, abi_table); return 0; } __initcall(ia32_binfmt_init);